Properly merge with instance

This time *really* closes #52