fix merge problem, add dist