Fixed errors in merge. However units don't render.