fix a merge thingy