Fix of incorrect merge