Files created by resolve conflict. How do I remove those files?