Ups, forgot to remove one conflict tag from previous commit.
Ups, forgot to remove one conflict tag from previous commit.

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