fix merge bug

Author: LasNikas

src/schemes/fluid/pressure_acceleration.jl

@@ -51,17 +51,12 @@ See [Tensile Instability Control](@ref tic) for more information on this techniq
     and therefore requires a free surface detection method. This is not yet implemented.
     **This technique cannot be used in a free surface simulation.**
 """
-@inline function tensile_instability_control(m_a, m_b, rho_a, rho_b, p_a::Real, p_b, W_a)
+@inline function tensile_instability_control(m_a, m_b, rho_a, rho_b, p_a, p_b, W_a)
     # Same as `pressure_acceleration_continuity_density`, but using the minus formulation
     # when pressures are negative to avoid tensile instability.
     return -m_b * (abs(p_a) + p_b) / (rho_a * rho_b) * W_a
 end
 
-# Fallback when `p_a` is not a scalar but a field, as it is the case in `dv_shifting`
-@inline function tensile_instability_control(m_a, m_b, rho_a, rho_b, p_a, p_b, W_a)
-    return pressure_acceleration_continuity_density(m_a, m_b, rho_a, rho_b, p_a, p_b, W_a)
-end
-
 # This formulation was introduced by Hu and Adams (2006). https://doi.org/10.1016/j.jcp.2005.09.001
 # They argued that the formulation is more flexible because of the possibility to formulate
 # different inter-particle averages or to assume different inter-particle distributions.