I'd merge it, there might be a 'better' way to deal with this but I wouldn't know it as well. Does sound like an interesting case for a rainy sunday evening :)