Code

Fix fmt-merge-msg counting.