comit lagi tapi bisa gak ya?
Merge branch 'master' of https://github.com/fandiiachmad/myrepository

Conflicts:
	test.txt