remove .idea
Merge remote-tracking branch 'origin/master'
remove .idea + update config