foo
test now says test (on foobranch)
Test now also says foo
Fixed merge conflict
FOOBRANCH
Merged foobranch over master branch