Removed Query specific parameter values from Param classes
Resolving conflicts in merge