Merge branch 'development', remote branch 'origin/development' into development
EoD