jose branch file
something
New file in master
Merge branch 'feature'
in the master
this is the branch
Merge branch 'feature'

Conflicts:
	first_file.txt

selected both changes
new file