Delete diff conflict copy