first commit
solve conflict  with .gitignore