Fix incomplete merge conflict
Fix incomplete merge conflict

barseghyanartur/flower,tellapart/flower,tellapart/flower,ucb-bar/bar-crawl-web,Lingling7/flower,allengaller/flower,ChinaQuants/flower,raphaelmerx/flower,pygeek/flower,pygeek/flower,marrybird/flower,alexmojaki/flower,pj/flower,lucius-feng/flower,asmodehn/flower,marrybird/flower,raphaelmerx/flower,jzhou77/flower,Lingling7/flower,allengaller/flower,getupcloud/flower,lucius-feng/flower,jzhou77/flower,allengaller/flower,pj/flower,Lingling7/flower,alexmojaki/flower,getupcloud/flower,ChinaQuants/flower,raphaelmerx/flower,barseghyanartur/flower,pygeek/flower,jzhou77/flower,marrybird/flower,asmodehn/flower,pj/flower,ucb-bar/bar-crawl-web,tellapart/flower,getupcloud/flower,alexmojaki/flower,barseghyanartur/flower,ucb-bar/bar-crawl-web,ChinaQuants/flower,lucius-feng/flower,asmodehn/flower