merge handling