Fixed conflict
Merge branch 'resource'
Gemfile conflicts solved