clarifying again (merge error)