add some ignore
merge from air