clean start correct
merged conflicts after hard reset
clean start correct