remove isEmptyObject - something weird happened in merge