Resolve conflicts with upstream repository