changed gitignore
merge conflict solved