merge refactory and avatar shop