smooth heaviside
resolving conflicts