KAZOO-962: correct merge conflict resolution