commit to check code changes between branches
Changes to produce conflict
changes in index file to produce conflict
Again change to produce conflict
Merge conflict removed
Added a new file to test conflict
Delete a test file to produce remove conflict
edited same file which was deleted by new_feature branch to produce remove conmflict
Merge branch 'new_feature' into test1

Conflicts:
	test.txt
Delete test file