Weird merge tags added in