move resources to correct place
fix merge error (DrawerItem)