Add data folder
Resolve merge