fix minor conflict between tags.