Add doctest
Fix some specs
Update merge to use a GenServer