diff --git a/setup/config/config_kafka.go b/setup/config/config_kafka.go
index c58c48bbd..637f9df24 100644
--- a/setup/config/config_kafka.go
+++ b/setup/config/config_kafka.go
@@ -10,11 +10,8 @@ const (
 	TopicOutputRoomEvent         = "OutputRoomEvent"
 	TopicOutputClientData        = "OutputClientData"
 	TopicOutputReceiptEvent      = "OutputReceiptEvent"
-<<<<<<< HEAD
 	TopicOutputPresenceData      = "OutputPresenceData"
-=======
 	TopicOutputSigningKeyUpdate  = "OutputSigningKeyUpdate"
->>>>>>> eb0efa46361ca2d80050ef871d0a8f20652398af
 )
 
 type Kafka struct {
diff --git a/userapi/api/api_trace.go b/userapi/api/api_trace.go
index 84dcb309c..3ab1a7005 100644
--- a/userapi/api/api_trace.go
+++ b/userapi/api/api_trace.go
@@ -116,6 +116,30 @@ func (t *UserInternalAPITrace) QueryOpenIDToken(ctx context.Context, req *QueryO
 	return err
 }
 
+func (t *UserInternalAPITrace) InputPresenceData(ctx context.Context, req *InputPresenceRequest, res *InputPresenceResponse) error {
+	err := t.Impl.InputPresenceData(ctx, req, res)
+	util.GetLogger(ctx).Infof("InputPresenceData req=%+v res=%+v", js(req), js(res))
+	return err
+}
+
+func (t *UserInternalAPITrace) QueryPresenceForUser(ctx context.Context, req *QueryPresenceForUserRequest, res *QueryPresenceForUserResponse) error {
+	err := t.Impl.QueryPresenceForUser(ctx, req, res)
+	util.GetLogger(ctx).Infof("QueryPresenceForUser req=%+v res=%+v", js(req), js(res))
+	return err
+}
+
+func (t *UserInternalAPITrace) QueryPresenceAfter(ctx context.Context, req *QueryPresenceAfterRequest, res *QueryPresenceAfterResponse) error {
+	err := t.Impl.QueryPresenceAfter(ctx, req, res)
+	util.GetLogger(ctx).Infof("QueryPresenceAfter req=%+v res=%+v", js(req), js(res))
+	return err
+}
+
+func (t *UserInternalAPITrace) QueryMaxPresenceID(ctx context.Context, req *QueryMaxPresenceIDRequest, res *QueryMaxPresenceIDResponse) error {
+	err := t.Impl.QueryMaxPresenceID(ctx, req, res)
+	util.GetLogger(ctx).Infof("QueryMaxPresenceID req=%+v res=%+v", js(req), js(res))
+	return err
+}
+
 func js(thing interface{}) string {
 	b, err := json.Marshal(thing)
 	if err != nil {