Changed conflictfile