solve merge problem