av: fix merge
Merge pull request #39 from TeamHackLG/cm-11.0

av: fix merge