fix mistakes from merge
fix mistakes from merge

Erol/rails,mechanicles/rails,tgxworld/rails,rossta/rails,odedniv/rails,felipecvo/rails,kmcphillips/rails,lcreid/rails,untidy-hair/rails,yalab/rails,vipulnsward/rails,bogdanvlviv/rails,eileencodes/rails,Erol/rails,vipulnsward/rails,ngpestelos/rails,betesh/rails,ngpestelos/rails,Vasfed/rails,stefanmb/rails,riseshia/railsguides.kr,eileencodes/rails,amoody2108/TechForJustice,koic/rails,Envek/rails,maicher/rails,mohitnatoo/rails,illacceptanything/illacceptanything,sealocal/rails,mathieujobin/reduced-rails-for-travis,untidy-hair/rails,assain/rails,maicher/rails,illacceptanything/illacceptanything,richseviora/rails,elfassy/rails,BlakeWilliams/rails,deraru/rails,bradleypriest/rails,Stellenticket/rails,gavingmiller/rails,gavingmiller/rails,repinel/rails,illacceptanything/illacceptanything,kmcphillips/rails,pvalena/rails,Vasfed/rails,BlakeWilliams/rails,coreyward/rails,assain/rails,ttanimichi/rails,rbhitchcock/rails,aditya-kapoor/rails,stefanmb/rails,esparta/rails,riseshia/railsguides.kr,MSP-Greg/rails,assain/rails,gfvcastro/rails,kmcphillips/rails,printercu/rails,mtsmfm/railstest,yahonda/rails,mijoharas/rails,repinel/rails,kirs/rails-1,pvalena/rails,riseshia/railsguides.kr,matrinox/rails,gfvcastro/rails,mohitnatoo/rails,deraru/rails,bolek/rails,Vasfed/rails,rbhitchcock/rails,gauravtiwari/rails,koic/rails,baerjam/rails,mohitnatoo/rails,utilum/rails,sergey-alekseev/rails,gauravtiwari/rails,kirs/rails-1,rossta/rails,jeremy/rails,samphilipd/rails,esparta/rails,illacceptanything/illacceptanything,matrinox/rails,alecspopa/rails,esparta/rails,travisofthenorth/rails,yawboakye/rails,kmayer/rails,iainbeeston/rails,kamipo/rails,schuetzm/rails,prathamesh-sonpatki/rails,alecspopa/rails,MichaelSp/rails,tjschuck/rails,illacceptanything/illacceptanything,MSP-Greg/rails,georgeclaghorn/rails,travisofthenorth/rails,notapatch/rails,utilum/rails,fabianoleittes/rails,travisofthenorth/rails,MichaelSp/rails,MSP-Greg/rails,vassilevsky/rails,pvalena/rails,arjes/rails,yahonda/rails,mtsmfm/rails,mohitnatoo/rails,deraru/rails,illacceptanything/illacceptanything,yawboakye/rails,georgeclaghorn/rails,Edouard-chin/rails,voray/rails,yahonda/rails,tjschuck/rails,amoody2108/TechForJustice,gavingmiller/rails,Stellenticket/rails,iainbeeston/rails,rbhitchcock/rails,arunagw/rails,sergey-alekseev/rails,yasslab/railsguides.jp,shioyama/rails,arjes/rails,richseviora/rails,coreyward/rails,yasslab/railsguides.jp,kmcphillips/rails,joonyou/rails,BlakeWilliams/rails,mtsmfm/rails,kddeisz/rails,kenta-s/rails,Spin42/rails,Edouard-chin/rails,jeremy/rails,tjschuck/rails,pvalena/rails,lcreid/rails,joonyou/rails,starknx/rails,hanystudy/rails,fabianoleittes/rails,vipulnsward/rails,riseshia/railsguides.kr,rails/rails,Stellenticket/rails,rails/rails,eileencodes/rails,elfassy/rails,Envek/rails,kddeisz/rails,MSP-Greg/rails,rafaelfranca/omg-rails,shioyama/rails,Envek/rails,iainbeeston/rails,rafaelfranca/omg-rails,ngpestelos/rails,mathieujobin/reduced-rails-for-travis,flanger001/rails,brchristian/rails,Envek/rails,arunagw/rails,sealocal/rails,richseviora/rails,schuetzm/rails,voray/rails,kirs/rails-1,utilum/rails,alecspopa/rails,yhirano55/rails,tgxworld/rails,EmmaB/rails-1,felipecvo/rails,arunagw/rails,ttanimichi/rails,bolek/rails,ledestin/rails,arunagw/rails,prathamesh-sonpatki/rails,baerjam/rails,marklocklear/rails,Sen-Zhang/rails,illacceptanything/illacceptanything,kddeisz/rails,mathieujobin/reduced-rails-for-travis,printercu/rails,flanger001/rails,pschambacher/rails,vassilevsky/rails,printercu/rails,yawboakye/rails,tgxworld/rails,kaspth/rails,bolek/rails,rafaelfranca/omg-rails,fabianoleittes/rails,kddeisz/rails,Vasfed/rails,pschambacher/rails,BlakeWilliams/rails,kmayer/rails,georgeclaghorn/rails,brchristian/rails,samphilipd/rails,joonyou/rails,Stellenticket/rails,illacceptanything/illacceptanything,baerjam/rails,marklocklear/rails,gfvcastro/rails,Spin42/rails,koic/rails,xlymian/rails,tijwelch/rails,kaspth/rails,travisofthenorth/rails,brchristian/rails,untidy-hair/rails,yawboakye/rails,sergey-alekseev/rails,Spin42/rails,mtsmfm/rails,utilum/rails,bogdanvlviv/rails,Erol/rails,lucasmazza/rails,fabianoleittes/rails,jeremy/rails,betesh/rails,palkan/rails,hanystudy/rails,yalab/rails,hanystudy/rails,mechanicles/rails,aditya-kapoor/rails,arjes/rails,notapatch/rails,iainbeeston/rails,sealocal/rails,ledestin/rails,pschambacher/rails,ledestin/rails,kmayer/rails,bogdanvlviv/rails,88rabbit/newRails,coreyward/rails,betesh/rails,88rabbit/newRails,illacceptanything/illacceptanything,yhirano55/rails,tijwelch/rails,printercu/rails,prathamesh-sonpatki/rails,lucasmazza/rails,yasslab/railsguides.jp,bradleypriest/rails,gcourtemanche/rails,notapatch/rails,notapatch/rails,bogdanvlviv/rails,kaspth/rails,tijwelch/rails,xlymian/rails,EmmaB/rails-1,odedniv/rails,mijoharas/rails,Sen-Zhang/rails,eileencodes/rails,prathamesh-sonpatki/rails,illacceptanything/illacceptanything,amoody2108/TechForJustice,illacceptanything/illacceptanything,flanger001/rails,odedniv/rails,ttanimichi/rails,Edouard-chin/rails,elfassy/rails,samphilipd/rails,illacceptanything/illacceptanything,mtsmfm/railstest,shioyama/rails,joonyou/rails,lcreid/rails,tjschuck/rails,kenta-s/rails,EmmaB/rails-1,kamipo/rails,rossta/rails,maicher/rails,untidy-hair/rails,yhirano55/rails,Sen-Zhang/rails,marklocklear/rails,mijoharas/rails,gauravtiwari/rails,kachick/rails,mechanicles/rails,lucasmazza/rails,88rabbit/newRails,kachick/rails,voray/rails,lcreid/rails,kachick/rails,stefanmb/rails,yasslab/railsguides.jp,palkan/rails,jeremy/rails,shioyama/rails,xlymian/rails,illacceptanything/illacceptanything,flanger001/rails,illacceptanything/illacceptanything,deraru/rails,yalab/rails,vassilevsky/rails,tgxworld/rails,vipulnsward/rails,gcourtemanche/rails,kenta-s/rails,mtsmfm/railstest,starknx/rails,aditya-kapoor/rails,betesh/rails,gfvcastro/rails,kamipo/rails,Edouard-chin/rails,repinel/rails,rails/rails,georgeclaghorn/rails,yhirano55/rails,starknx/rails,bradleypriest/rails,aditya-kapoor/rails,yalab/rails,assain/rails,palkan/rails,esparta/rails,gcourtemanche/rails,yahonda/rails,repinel/rails,felipecvo/rails,schuetzm/rails,mechanicles/rails,MichaelSp/rails,rails/rails,Erol/rails,palkan/rails,illacceptanything/illacceptanything,matrinox/rails,schuetzm/rails,baerjam/rails