Fixed conflicts

Author: GrigoriyPA

ydb/core/fq/libs/row_dispatcher/row_dispatcher.cpp

@@ -1,6 +1,7 @@
 #include "row_dispatcher.h"
 
 #include "actors_factory.h"
+#include "common.h"
 #include "coordinator.h"
 #include "leader_election.h"
 

ydb/core/fq/libs/row_dispatcher/ya.make

@@ -2,6 +2,7 @@ LIBRARY()
 
 SRCS(
     actors_factory.cpp
+    common.cpp
     coordinator.cpp
     leader_election.cpp
     row_dispatcher_service.cpp