Completed users show page and resovision partial for the resovision show page
fixed merge conflict in _resovision.html.erb partial