- Executes URL query parameter conflict resolver action in Router class - Adds unit tests
- Updates unit tests - Fixes #634
- Updates other classes to use the new name - Updates unit tests