bash: resolve merge conflict