KAZOO-1539: fix conflict in cf_park