Attempt to fix Conflict