fix troubles of merge