Build #38:   implemented soft delete trait methods on base model on branch develop almost 11 years ago

Build #127:   fixed conflict in composer.json on branch master almost 11 years ago