Added this line to master after merging branch branch_20140829
Added this line to branch branch_20140829_v2 after branching it from branch_20140829
Modified the first line by removing the word "just"
Merge branch 'branch_20140829_v2'

Conflicts:
	file1.txt
Really modified the first line by removing the word "just" which wasn't done earlier.
Adding this sentence before merging with branch_20140829_v3
Merge branch 'branch_20140829_v3'

Conflicts:
	file1.txt

Resolved conflicts, added this line and about to merge now