10 : Created empty file (file for data newfile.js)
11 : Edit file app.js (Add year in alert)
12: Merge after resolvw conflicts (develop-feature2  with develop)