fixed merge issue with overridden fields