Edit File: conflicts.pickle