merge conflict resolve; accepted tuhinc's changes; added .idea/ to gitignore