Fixed merge screw up by Git