fix of merge