apparently merge origin/dev does work now :)