Wrap all uses of this.dataType
fix merge conflicts