trying to add .idea dir to gitignore
messing up merges
require merge?