Undoing a mixed up merge