City City hall and CUPE come to an agreement, avoid a work stoppage and live happily ever after (only not really)