Splitting files
Adding text
Merge branch 'separate-files'
Introduce merge conflict
Add conflicting text
Resolved conflicts