merge local code