Fixed merge thingy