Merge with existing reservation data, don't just overwrite

This is almost the same, but the merge method does handle a few special
cases where we know which side is "better".