modifying for conflicts

@rehab-arafa  review my code