cleanup gemfile
fix conflicts
schema
deleted development log