Fixing Conflict Issues