fix merge conflicts
add sending of yos
Merge branch 'feature/yo' into develop
Merge branch 'release/yo'