merge local and staging

merge local and staging