fixed one last conflict that did not show up earlier