tweaking paragraph width to fit text
fixing merge conflicts