Fix bug with conflict on prompt