diff --git a/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp b/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp
index 5aa13ce..436124a 100644
--- a/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp
+++ b/sources/queued-server/src/QueuedTcpServerResponseHelperApi1.cpp
@@ -99,9 +99,12 @@ QVariantHash QueuedTcpServerResponseHelperApi1::getData(
         else if (_type == "POST")
             output = QueuedTcpServerResponseHelperTask::addOrEditTask(
                 _arg.toLongLong(), _data, _token);
+<<<<<<< HEAD
         else if (_type == "PUT")
             output = QueuedTcpServerResponseHelperTask::startOrStopTask(
                 _arg.toLongLong(), _token);
+=======
+>>>>>>> baa20af363cb4b97cb6f7b36f833cf40f34cc61d
         else
             output = {{"code", 405}};
         break;
diff --git a/sources/queued/include/queued/QueuedCoreAdaptor.h b/sources/queued/include/queued/QueuedCoreAdaptor.h
index 515e58f..1f05158 100644
--- a/sources/queued/include/queued/QueuedCoreAdaptor.h
+++ b/sources/queued/include/queued/QueuedCoreAdaptor.h
@@ -215,6 +215,10 @@ QHash<QString, QHash<QString, QString>> getStatus();
  * @return task properties
  */
 QVariantHash getTask(const long long _id);
+/**
+ * @return server status inforamtion
+ */
+QHash<QString, QHash<QString, QString>> getStatus();
 /**
  * @brief get task property
  * @param _id
diff --git a/sources/queued/src/QueuedPropertyInterface.cpp b/sources/queued/src/QueuedPropertyInterface.cpp
index a1d7c5b..d99f5f7 100644
--- a/sources/queued/src/QueuedPropertyInterface.cpp
+++ b/sources/queued/src/QueuedPropertyInterface.cpp
@@ -106,8 +106,11 @@ QDBusVariant QueuedPropertyInterface::User(const long long id,
         return QDBusVariant(response);
     } else {
         auto response = user->property(qPrintable(property));
+<<<<<<< HEAD
         if (response.type() == QVariant::DateTime)
             response = response.toDateTime().toString(Qt::ISODateWithMs);
+=======
+>>>>>>> baa20af363cb4b97cb6f7b36f833cf40f34cc61d
         return QDBusVariant(response.isValid() ? response : "");
     }
 }