minor progress in soft deleting users
merge error fixed