fixed bad automatic merge