Create Votes and include Resource
Fix old merge conflicts