small fix to merge, notes