fix memory leak in sp_resize and remove duplicate definition of NEW macros
improve XML parsing of FMI model description
resolve merge conflict