Okay, I messed up that merge. I think it'll be easier to create a new branch from trunk so I'm deleting the old one to start again.