fixed the Sadek
fixing merge conflicts