Fix of broken merge