Implement comment carry over during the merge

Signed-off-by: Yury Tsarev <ytsarev@suse.com>