fix conflicts
fix conflicts

yunspace/scoop,toxeus/scoop,nikolasd/scoop,Cyianor/scoop,berwyn/scoop,vidarkongsli/scoop,nueko/scoop,coonce/scoop,lukesampson/scoop,vinaynambiar/lukesampson-,kodybrown/scoop,reelsense/scoop,r15ch13/scoop,rodericktech/scoop,Congee/scoop,bpollack/scoop,rasa/scoop