Fix additional syntax errors and issue with symbolic links overriding existing files
Merge local-deploy