Fix strange merge