fixed strange merge problem