Clean up merge foul up.