fix clone / merge