Created a branch branch_20140829 and added this line
Added this line to the master after creating a branch branch_20140829
Merge branch 'branch_20140829'

Conflicts:
	file1.txt