Comit first file
Modified first file
Modified first file
Merge branch 'master' into first_branch

Conflicts:
	firstFile.txt
Resolved conflicts in first file
mod. first file
mod first_file
mod firstFile.txt
mod. firstFile.txt
Merge branch 'second_branch'