Fix that merge mess.