Fix merge conflicts (add softDelete param)