Fix merge errors in svg, form