added data folder and fixed conflicts