adding fatiha
merge conflicts fix