Gah! what went wrong with merge here!