gitignored a data folder
fixed conflict on gitignore