Fixing Merge Conflict