Merger: added unit tests
Merger: improved result on conflict
Merge pull request #35 from sils1297/new_merger_tests

New merger tests