greetings to new things are added.
merge conflicts are resolved.