finish feature 916-refactor_infomedia_access
fix merge conflicts