Fixed Omar Conflict