change D offline
resolve confict