fixed strange merge