Git ignoring the .idea stuff
merging
...