Resolve conflicts with upstream