tried to fix gitignore file with classes
Fix merge conflicts