fixed DataController merge