fast forward to origin/master
fix post.rb conflict