Create initialcommit.txt

Merge
Create 2.txt

commit
Create Testing_Merge.Txt
 conflixt resolbved