d1e362405e
- resolved conflicts, minor whitespace and fixed quote. - note: textlib_get_instance() is already deprecated