Did some commit.
Fixed some confilct in DataLayer FILE