Applying merges correctly is difficult...