add stuff to newfile2.txt
Merge branch 'feature-1234' into develop