save
solve conflict
modify
New project:A test
Merge branch 'master' of https://github.com/Radwa-Gamal/simple_projects