Updates to SDF
merge error fixed