Fixing Merging issues