apply missing diffs that were lost in the merge conflict resolution