added resources
merge fix