added ignore
fix conficts