fixes conflict artifact from 41271fd