This paper addresses the problem of reasoning under conflicts within rule-based systems. Nowadays, using logical rules to infer knowledge, express restrictions and so on has shown a great interest in several domains which makes rule-based systems very popular. However, since rules may originate from heterogeneous sources and change over time, methods are required to maintain rules consistency by detecting and resolving the conflicts. The method we put forward in this work refines a form of non-monotonic reasoning called argumentation with new definitions. Through implementing and evaluating the framework to a smart home test-bed, the proposed framework dynamically detects and flexibly resolves conflicts. The result proves the efficiency and viability of our proposal