Fix bad merge conflict on develop