Tested settings for AR0130

And changed merge setting to default to --no-ff onto master branch