fixed left over git conflit text. derp