add --no-ff when merging master onto local-hedgehog