merge agent and agent_config pkg