removes a line from the beginning of file3
modify file2
modified file2 - added a line in the beginning
Merge branch 'test_branch'

Conflicts:
	file2