nonconflicting 1
conflicting 1
nonconflicting 2
conflicting 2
Merge pull request #2 from eduardog3000/master

Merge first conflicting branch into mediator.
Revert conflicting files.
Merge pull request #4 from eduardog3000/a

Merge second conflicting branch into mediator.
Revert conflicting files.

Branch is now a combo of the conflicting branches, with the conflicting
files reverted to before there was a conflict.
Solved conflicts.
Merge branch 'b'