KAZOO-962: commit all the corrections for merge conflict resolution