thought i already fixed the conflict