Feature/sshoc 98 fixing merging errors

Eliza Kalatarequested to merge
feature/SSHOC-98_fixing_merging_errors into develop

The goal was to fix some issues with merging items task.

Merge request reports