fixed mdmgt to update notindb field
merge branches for mdmgt
unstable conflict resolver
unstable conflict resolver