Move merging to build.sh so that failing merge will fail build
Improve commit messages: make summaries more useful and consistent