think I got the local edit right, not sure
merge