Fix automatic merge