Fixing a merge gone wrong