int.'s conflict resolved
Merge branch 'master' of https://github.com/anbadovideo/anbado-video