fix merge conflict regarding database and log files