Fixing Merge errors