Create me.txt
Create you.txt
Create my.txt
Merge commit '71ff5e4a2840e08c6a0dba6537ed35ddfd5742fe'

Conflicts:
	me.txt
Merge commit '71ff5e4a2840e08c6a0dba6537ed35ddfd5742fe'

Conflicts:
	me.txt (reverted from commit a34befc997fcae3936825a8435a88fa003e654e5)