comment tweaks
merge minor conflict