formatting tweaks
conflict resolved