made a change
made a change
add
made other changes
Merge branch 'day'

Conflicts:
	test.rb