redo conflict return codes so [] means no conflict (don't care why) otherwise a list