Address PR comments for merge policy providers