fixed merge conflict remains
fixed merge conflict remains

odin1314/scribe,rjbhewei/scribe,fengshao0907/scribe,btnguyen2k/scribe,fengshao0907/scribe,traviscrawford/scribe,haozi3156666/scribe,lawrencewu/scribe,btnguyen2k/scribe,yshaojie/scribe,uuunic/scribe,Ayear0608/scribe,abhishekdelta/scribe,Ayear0608/scribe,esteigler/scribe,kangkot/scribe,fengshao0907/scribe,rdio/scribe-public,abhishekdelta/scribe,rdio/scribe-public,uuunic/scribe,kovyrin/scribe,yshaojie/scribe,Ayear0608/scribe,tempbottle/scribe,abhishekdelta/scribe,lawrencewu/scribe,Tony-Zhang03/scribe,fengshao0907/scribe,kangkot/scribe,traviscrawford/scribe,swiftype/scribe,swiftype/scribe,btnguyen2k/scribe,btnguyen2k/scribe,apprentice1989/scribe,lawrencewu/scribe,betable/scribe,kovyrin/scribe,facebookarchive/scribe,odin1314/scribe,rdio/scribe-public,InMobi/scribe,rjbhewei/scribe,btnguyen2k/scribe,traviscrawford/scribe,bowlofstew/scribe,yshaojie/scribe,InMobi/scribe,haozi3156666/scribe,iyagi15/scribe,schmits/scribe,Ayear0608/scribe,esteigler/scribe,iyagi15/scribe,esteigler/scribe,bowlofstew/scribe,haozi3156666/scribe,odin1314/scribe,betable/scribe,tempbottle/scribe,odin1314/scribe,haozi3156666/scribe,lawrencewu/scribe,tempbottle/scribe,Tony-Zhang03/scribe,iyagi15/scribe,rdio/scribe-public,bowlofstew/scribe,bowlofstew/scribe,yshaojie/scribe,odin1314/scribe,rjbhewei/scribe,traviscrawford/scribe,swiftype/scribe,iyagi15/scribe,Ayear0608/scribe,esteigler/scribe,haozi3156666/scribe,apprentice1989/scribe,schmits/scribe,bowlofstew/scribe,yshaojie/scribe,InMobi/scribe,lawrencewu/scribe,kovyrin/scribe,rjbhewei/scribe,traviscrawford/scribe,facebookarchive/scribe,bowlofstew/scribe,uuunic/scribe,rdio/scribe-public,schmits/scribe,kovyrin/scribe,apprentice1989/scribe,tempbottle/scribe,swiftype/scribe,kovyrin/scribe,tempbottle/scribe,kangkot/scribe,facebookarchive/scribe,Tony-Zhang03/scribe,schmits/scribe,apprentice1989/scribe,kangkot/scribe,InMobi/scribe,uuunic/scribe,esteigler/scribe,kangkot/scribe,rjbhewei/scribe,Tony-Zhang03/scribe,betable/scribe,uuunic/scribe,betable/scribe,Tony-Zhang03/scribe,fengshao0907/scribe,apprentice1989/scribe,facebookarchive/scribe,InMobi/scribe,betable/scribe,abhishekdelta/scribe,abhishekdelta/scribe,facebookarchive/scribe,swiftype/scribe,traviscrawford/scribe,schmits/scribe,InMobi/scribe,iyagi15/scribe