t742 fixed dataexport defects
t742 removed conflicts