Removed merging issues