Data: merge for two tables

+ fix includes
+ discretization example (0.82)
+ fix namespaces