create a new branch at 14:42
create a new branch at 14:44
conflict fixed
add merge
merge width no-ff