nambah 2 file
dddd
add branch2.txt
added agus darma kusuma
edit ini baru.txt
Merge remote-tracking branch 'remotes/origin/branch2'

Conflicts:
	ini baru.txt