Make sure to call merge=True, to avoid any trouble.
Merge branch 'update_kalite' into central_server_stats