oops, missed some merge code