add resource
fixed merge conflicts