Use latest local and merge in our changes.