Added Lists resource
fixed merge conflicts