Conflict fixes and more typographic tweeks