Added another feature
Some change in the master branch
Another change in the master branch
Fixed conflict from another_feature branch
Added lines 1 and 3 using add -p

Added line 2 that was left out in add -p
Merge commit '5ef655a4caf8'

Conflicts:
	my_file