pull amends made locally on server