Add instructions on fast-forward merges