fix git conflict and special tag bug