[daemon] merge