added Git Merge command
added .idea/* to ignore list