merge conflict
update master with rails
resolve merge conflict