osx terminal
merged