added inteliJ project directory to gitignore
fixed conflicts