commit -a bei merge conflict
commit after everything added