ignore test-out
fix .gitignore merge conflict