conflict restore