add resource and request pages
resolve merge conflicts