learn how to merge another branch This is a new line added in the learn-notes branch that will be kept after it is merged.