Cleaning conflict traces from a few files.