merge and parameters fix