merge branch dataAbstract