Git merge abort. Resolve conflict git. git bash merge conflict. gitlab resolve conflict. git merge conflict vim.