Attempting to make automatic merge possible