* Updated convert_swig to account for template directive changes in SWIG 4 * Fixed merge issues * Merge cleanup