fixed bolded issues, name bolding issues
Fixed merge conflict?