some fixes on params for post
fixed merge conflict in Gemfile.lock