another merge question