commit before merge
delete all
change st