trynew conflict
Merge branch 'trynew'

Conflicts:
	conflict.txt