revert back to serving assets from Aws
removed conflict lines