fix merge + begin checkout