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

Conflicts:
	src/foo/Main.java
dd fdfd fdfg
Added Bar.java
Merge branch 'yet-another-branch' of https://github.com/philipposgate/FooJavaApp.git into yet-another-branch
test 1