EDOC-1251: Fix for update conflict