fix mandatory_fields
merge