Cleaned up MergePolicyProvider. Fixed sonar issues.