Fixing Merge Issues