This is the added test
I made changes to the file
THis is a script text file
Merge branch 'test1'
yes merge both of them
Conflicts:
	test1
i changed some stuff