See if this fixes the conflict