first commit
add .idea to gitignore
fix merge issue