Fixing Merge Errors