Item entity merging refactor