Fix of merge fault