kkkkk
dddd
kkkkkk
fadfadsf
hahheiheiheia
try git commit --amend
modification in master.
modification on test1
modification on test2
Merge branch 'test2'

Conflicts:
	master.txt
add something from addremove
remove something from master
Merge branch 'addremovemaster'

Conflicts:
	master.txt
lalala
add la
clean
remote op