merge problem solved