Correct mergeCanon

[diegovdc]

Now (as of commit 02dbd94) that canons can have instrument and player keys, there should be a proper way to handle the merger of canons.