fix merge mistake
fix merge mistake

pat/kaminari,Zhomart/kaminari,Teino1978-Corp/Teino1978-Corp-kaminari,antstorm/kaminari,thiagorp/kaminari,JuanitoFatas/kaminari,sanrodari/kaminari,aelogica/kaminari,danimashu/kaminari,JuanitoFatas/kaminari,onursarikaya/kaminari,guodongme/kaminari,sr-education/kaminari,iberianpig/kaminari,pat/kaminari,helloqidi/mykaminari,aslanvaroqua/kaminari-mobile-views,mrhead/kaminari,sr-education/kaminari,peter-umb/umbie_kaminari,amatsuda/kaminari,mperrando/kaminari,royels/kaminari,jiamaozheng/kaminari,dblock/kaminari,sendgrid/kaminari,Boomkat/kaminari,amatsuda/kaminari,joe1chen/kaminari,sendgrid/kaminari,parity/kaminari,epicagency/kaminari,sanrodari/kaminari,fkagami/kaminari,onursarikaya/kaminari,Boomkat/kaminari,wkirschbaum/kaminari,thiagorp/kaminari,wkirschbaum/kaminari,plribeiro3000/kaminari,epicagency/kaminari,kaminari/kaminari,Teino1978-Corp/Teino1978-Corp-kaminari,sachin21/kaminari,plribeiro3000/kaminari,jiamaozheng/kaminari,sideci-sample/sideci-sample-kaminari,sendgrid/kaminari,iberianpig/kaminari,varvet/kaminari,dblock/kaminari,danimashu/kaminari,bonekost/kaminari,peter-umb/umbie_kaminari,aelogica/kaminari,jcoyne/kaminari,antstorm/kaminari,bsboris/kaminari,yui-knk/kaminari,kaminari/kaminari,bonekost/kaminari,guodongme/kaminari,bsboris/kaminari,sachin21/kaminari,mrhead/kaminari,joe1chen/kaminari,royels/kaminari,Zhomart/kaminari,parity/kaminari,mperrando/kaminari,varvet/kaminari,barkbox/cursor,mrstif/cursor,yui-knk/kaminari