Fix missed merge conflict on develop