solved merging issues