styling for what's been done
merging