Update 3-way-merge.md