Added a resource manager.
Fixed merge issues.