Fixing Conflict error