This is first commit.
this is second commit;
this is branch commit
add new comment
add new comment on branch
Merge branch 'master' of https://github.com/maruxyz/tutorial
Merge branch 'sub1' of https://github.com/maruxyz/tutorial

Conflicts:
	sample.rtf
sample2 add
master add comment