Fixing Merging Issues