Change keywords merger strategy
Add test cases