Resolve pull conflict for Merge branch 'master' of github.com:hanli32/peloton
Resolve pull conflict for Merge branch 'master' of github.com:hanli32/peloton

apavlo/peloton,yingjunwu/peloton,ShuxinLin/peloton,haojin2/peloton,haojin2/peloton,AngLi-Leon/peloton,cmu-db/peloton,yingjunwu/peloton,seojungmin/peloton,haojin2/peloton,haojin2/peloton,malin1993ml/peloton,ShuxinLin/peloton,PauloAmora/peloton,apavlo/peloton,ShuxinLin/peloton,yingjunwu/peloton,malin1993ml/peloton,PauloAmora/peloton,cmu-db/peloton,AllisonWang/peloton,vittvolt/peloton,apavlo/peloton,cmu-db/peloton,yingjunwu/peloton,yingjunwu/peloton,AllisonWang/peloton,PauloAmora/peloton,ShuxinLin/peloton,AllisonWang/peloton,prashasthip/peloton,prashasthip/peloton,vittvolt/peloton,vittvolt/peloton,malin1993ml/peloton,apavlo/peloton,prashasthip/peloton,apavlo/peloton,AngLi-Leon/peloton,haojin2/peloton,AngLi-Leon/peloton,PauloAmora/peloton,AllisonWang/peloton,yingjunwu/peloton,cmu-db/peloton,seojungmin/peloton,malin1993ml/peloton,cmu-db/peloton,vittvolt/peloton,vittvolt/peloton,prashasthip/peloton,malin1993ml/peloton,vittvolt/peloton,prashasthip/peloton,AngLi-Leon/peloton,seojungmin/peloton,seojungmin/peloton,cmu-db/peloton,ShuxinLin/peloton,malin1993ml/peloton,AngLi-Leon/peloton,seojungmin/peloton,PauloAmora/peloton,ShuxinLin/peloton,AllisonWang/peloton,AngLi-Leon/peloton,PauloAmora/peloton,apavlo/peloton,seojungmin/peloton,haojin2/peloton,prashasthip/peloton,AllisonWang/peloton