changed y to create conflict
added text
master message
branch 2
Merge branch 'conflict'

Conflicts:
	test.c
added more text