Added Fork, FileSet resolution. Fork, merge svg's