Edit file 2 for new_feature
Only one added in origin
Only change from conflict
Merge branch 'new_feature' of /home/ngailong/my_first_repository into new_feature

Conflicts:
	file2
Only file2 changed
Edit file2 in clone
Merge branch 'new_feature' of /home/ngailong/my_first_repository

Conflicts:
	file2
Merge branch 'master' of /home/ngailong/my_first_repository

Conflicts:
	file2
Only change file1