Fixed lingering if from merge
Merge branch 'staging' into dev