fix merge thingy