Resolved conflict
Resolved conflict

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