a little catastrophic merge