Merging issues fixed but some still remain