fixed a conflict? i thought i already changed this