update alive edit with separater
merge conflict
Merge branch 'master' of https://github.com/OSAStudio/newshub