buildignore
fix conflict