intial testfile commit
initial commit of newconflictfile
This is second time commit of newconfictfile
Merge branch 'newbranch'

Conflicts:
	newconflictfile
adding new conflict file in new branch
Merge branch 'newbranch'
test is aded
seth is addeed
test is merged