added Mandatory property
merged local with remote