handle the end-of-chain cases better
merge conflict
remove merge artifact