Update .gitignore for IntelliJ
Remove excess new lines
Fix typo
Prevent errors when trying to create a branch that already exists