Add conflict handling for more entities

Ghost Userrequested to merge
istaester/conflict-handling-2 into develop

Follow up to !372 (merged)

Merge request reports