changed greeting
merged