my commit
solving conflicts
updating .gitignore file
correcting mistakes
correcting mistakes