Fixed merge screw ups