merge with no-ff
second
third
last time
confict