test, to see if conflicts cleared up