modified local
merge