Renamed /queue_merge to /merge.

---
Squash commit from https://github.com/ndahlquist/whaler/pull/56 created by Whaler.