unbolded a few bits that looked unecessary.
conflicts, which is a good thing. Propper tagging of merge point done.