Merge countly-server