adding better errors gem
Testing merging