Resolve conflict
Resolve conflict


Former-commit-id: 4dd278a1d399db5df1a89613f7ab24b46d26666b
malin1993ml/peloton,AngLi-Leon/peloton,phisiart/peloton-p3,eric-haibin-lin/peloton-1,jessesleeping/iso_peloton,wangziqi2016/peloton,ShuxinLin/peloton,cmu-db/peloton,malin1993ml/peloton,wangziqi2016/peloton,apavlo/peloton,vittvolt/peloton,prashasthip/peloton,vittvolt/peloton,AllisonWang/peloton,AngLi-Leon/peloton,vittvolt/peloton,phisiart/peloton-p3,haojin2/peloton,phisiart/peloton-p3,wangziqi2016/peloton,AllisonWang/peloton,haojin2/peloton,seojungmin/peloton,prashasthip/peloton,phisiart/peloton-p3,wangziqi2016/peloton,malin1993ml/peloton,vittvolt/peloton,eric-haibin-lin/peloton-1,AllisonWang/peloton,PauloAmora/peloton,PauloAmora/peloton,jessesleeping/iso_peloton,jessesleeping/iso_peloton,cmu-db/peloton,ShuxinLin/peloton,yingjunwu/peloton,yingjunwu/peloton,ShuxinLin/peloton,PauloAmora/peloton,haojin2/peloton,eric-haibin-lin/peloton-1,vittvolt/15721-peloton,vittvolt/15721-peloton,seojungmin/peloton,PauloAmora/peloton,AngLi-Leon/peloton,phisiart/peloton-p3,seojungmin/peloton,jessesleeping/iso_peloton,AngLi-Leon/peloton,eric-haibin-lin/peloton-1,AllisonWang/peloton,AllisonWang/peloton,cmu-db/peloton,wangziqi2016/peloton,malin1993ml/peloton,prashasthip/peloton,vittvolt/15721-peloton,eric-haibin-lin/peloton-1,jessesleeping/iso_peloton,ShuxinLin/peloton,eric-haibin-lin/peloton-1,apavlo/peloton,cmu-db/peloton,haojin2/peloton,cmu-db/peloton,phisiart/peloton-p3,vittvolt/peloton,ShuxinLin/peloton,yingjunwu/peloton,yingjunwu/peloton,prashasthip/peloton,haojin2/peloton,vittvolt/15721-peloton,malin1993ml/peloton,apavlo/peloton,seojungmin/peloton,apavlo/peloton,apavlo/peloton,jessesleeping/iso_peloton,AngLi-Leon/peloton,ShuxinLin/peloton,PauloAmora/peloton,yingjunwu/peloton,cmu-db/peloton,AngLi-Leon/peloton,vittvolt/peloton,seojungmin/peloton,vittvolt/15721-peloton,PauloAmora/peloton,apavlo/peloton,vittvolt/15721-peloton,wangziqi2016/peloton,seojungmin/peloton,prashasthip/peloton,yingjunwu/peloton,malin1993ml/peloton,haojin2/peloton,AllisonWang/peloton,jessesleeping/iso_peloton,prashasthip/peloton