EditDescriptorModelProperties.js merge issue fix