added to gitignore
fixed conflict