add resource manager
merge