fix derp nested function call and derp merge error

llarp/ev/ev_libuv.cpp

@@ -822,7 +822,6 @@ namespace libuv
 #else
     uv_loop_configure(&m_Impl, UV_LOOP_BLOCK_SIGNAL, SIGPIPE);
 #endif
-    m_TickTimer->data   = this;
     m_LogicCaller.data = this;
     uv_async_init(&m_Impl, &m_LogicCaller, [](uv_async_t* h) {
       Loop* l = static_cast< Loop* >(h->data);

llarp/link/server.cpp

@@ -463,7 +463,7 @@ namespace llarp
   ILinkLayer::ScheduleTick(uint64_t interval)
   {
     tick_id = m_Logic->call_later(interval,
-                                  std::bind(&ILinkLayer::on_timer_tick, this));
+                                  std::bind(&ILinkLayer::OnTick, this));
   }
 
   void

llarp/link/server.hpp

@@ -207,11 +207,6 @@ namespace llarp
     }
 
    private:
-    void
-    on_timer_tick()
-    {
-      OnTick();
-    }
 
     void
     OnTick();