re fix merge on gitlock