readd notes that got lost during merge