Deleted Gemfile.lock due to merge conflict
rake issues