Fixed misnamed function in merge conflict
Fixed misnamed function in merge conflict

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