Add important info into file1
Merge branch 'dev'