Added a new feature branch
Made a small change
Merge branch 'new-feature'

Conflicts:
	slices-file.txt