fix bad merge conflicts
Merge remote-tracking branch 'origin/develop' into develop