add awesome_print gem
merge conflicts