fix automatic merge