try to solve merge problem