reset to line numbers
make a change
changed it back
Merge branch 'feature/test'

Conflicts:
	merge_this.txt
12