commit
merge conflict commit
first commitgit bash
add a file