a
b
c
Merge branch 'dev/wip'

Conflicts:
	file1.txt
e