main
main conflict
log verify from T