ENH: resolving conflict in #337