update resource done. merge develop