updated resources
fixed merge conflict