Re-merging changes that are from two different branches.