Use diff3 conflict style for git merges.
Turn off git push.default=simple until IntelliJ support it.
Normalize home directory name to avh4.
Update fetch git repositories.
Merge branch 'bash' into flipper