Resolve conflict with revertion