Correct last merge (part 1)