cdms2 integration
Fix merge conflict