spelling
notes about recent merges