REFACTOR: separate merge, prepare for implementing merge fastforward
IMPL PARTIAL: fastforward merges
DOC FIXUP: fix message
TEST: adopt tests to fastforward merges (some operations start passing), add fastforward test