fixes to merge suggestions