Use 'your'
Merge branch 'test_feat'
Use 'Now'
Merge branch 'test_feat'

Conflicts:
	README
Added file4
Merge branch 'new_feat'