merge local changes, remove reliance on global