diff --git a/CMakeLists.txt b/CMakeLists.txt
index 22a076d..f03ff81 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
 set(CPACK_PACKAGE_VERSION_MAJOR "3")
 set(CPACK_PACKAGE_VERSION_MINOR "1")
 set(CPACK_PACKAGE_VERSION_PATCH "0")
+>>>>>>> master
 
 if(CMAKE_BUILD_TYPE MATCHES RELEASE)
     set(ASSETS_PATH "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/htdocs")
diff --git a/src/mpd_client.c b/src/mpd_client.c
index ce34895..3c69cc2 100644
--- a/src/mpd_client.c
+++ b/src/mpd_client.c
@@ -1205,7 +1205,7 @@ int mympd_get_stats(char *buffer)
     if (stats == NULL)
         RETURN_ERROR_AND_RECOVER("mympd_get_stats");
     len = json_printf(&out, "{ type: mpdstats, data: { artists: %d, albums: %d, songs: %d, "
-        "playtime: %d, dbupdated: %d, dbplaytime: %d, mympd_version: %Q, mpd_version: %Q }}",
+        "playtime: %d, uptime: %d, dbupdated: %d, dbplaytime: %d, mympd_version: %Q, mpd_version: %Q }}",
         mpd_stats_get_number_of_artists(stats),
         mpd_stats_get_number_of_albums(stats),
         mpd_stats_get_number_of_songs(stats),