manual merge of diagchar