Fixing the joys of merge