Create sdfasfdasfd.txt
Update new.txt
Create kk.txt
Update new.txt
Merge branch 'dev2'