merge: remove wrong behaviouri with fast-forward