Fix merge manners