Fixed strange merge