seniro dev merge it with conflict ,come on