commited for conflict
test
resolved commits
testing
resolved tests
checkout