Fix of merge