clean test.txt
fix conflicts