sets up assets and new partials
fixes merge conflict