change back to Menlo Regular
merge conflict