Fix merge conflict: prompt should not always show.