Add todo
Add merge.readCanFastForward()
Handle fast forward merges
Finish merge abort tests
Add tests for fast forward merge