Merging in data folder changes