Resolve merge conflicts from branch changes