first change
bbbb
vvcvcvcvvc
Merge remote-tracking branch 'origin/another-branch'

Conflicts:
	src/foo/Main.java
dd fdfd fdfg
Create README.md
Update README.md
Merge branch 'another-branch'
Merge branch 'master' into another-branch

Conflicts:
	src/foo/Main.java