fix bug:tag conflict