Fix segfault by making unit conflict CDMaybe