fixing "Fixing Conflict"