SUPPOSEDLY fixing merge conflicts
Cleaning up .idea