give me merge conflicts please
Merge branch 'feature-rebase-learning'

Conflicts:
	newfile