Fix merge problem in params.