idea changes
merge commit with idea conflicts
removed idea directory
added .idea/ dir to gitignore