Bugfix and some more merge logging.
Do not merge while database synchronization is in progress.