fix bad merge
fix bad merge

Mingling94/Sia,rivine/rivine,NebulousLabs/Sia,mtlynch/Sia,mharkus/Sia,MrStrong/Sia,ericflo/Sia,mharkus/Sia,mtlynch/Sia,NebulousLabs/Sia,mnsl/Sia,johnathanhowell/Sia,rivine/rivine,ericflo/Sia,ChrisSchinnerl/Sia,ChrisSchinnerl/Sia,MrStrong/Sia,mnsl/Sia,kustomzone/Sia