key_commit: tweak to fix merge conflict