solved merge problem