remove empty file
Implement a more general version of the merge command

Also, add tests for this command.

This fixes #71.