resolve the conflict and added my code

@Tharwat7