Added text to file
Merge branch 'new_branch'
Just playing with merging
Just commit
resolved conflict