Edit conflict.txt! I edited from Windows.