added neat gem
fixed merge conflict