added some ignore logic
merge