Resetting to last working merge