Fix the merges