Add notes so we have a merge conflict.