update dmatrix calc / force negation
resolve conflict