Stupid merge tool! !#§$%&