Save the file this time. remove conflict junk.