Resolving rebase conflict