gemfile lock update
merge conflicts
added model classes manually as gem not working at the moment