if you merge something, make it properly