tried to fix gitignore
first conflict resolution