Fixing Merge Conflicts.