Test added file
This is a commit test with an empty line\nThis is the new line
This is a test
Merge branch 'feature_1' into develop
test
Merge branch 'test_1' into develop
Merge pull request #1 from rive04-11-2/develop

Develop test
test2
Merge pull request #2 from rive04-11-2/develop

finished test
test3
commit demo fork
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #3 from rive04-11-2/develop

Finished bug 1
before pull request
pull2
Merge remote-tracking branch 'upstream/develop' into develop
awesome feature
awesome feature, merge conflict?
Merge remote-tracking branch 'upstream/develop' into develop
awesome feature