Add paranoid delete and edit/update to rules resource
Fix merge conflict