Add a merge_conditions to queue_rules to replace conditions

The field conditions of queue_rules has now been renamed merge_conditions to make it clearer what the conditions are used for.

The old field conditions still works.