Context aware systems are embedded in the environment and provide services anytime and everywhere. Context aware system is built upon context information gathered from the environment and the adaptation rule which describes what need to be performed for the context information gathered. Consistent behavior of the context aware system will be ensured by the complete and correct context information and adaptation rules. There may have a situation where conflicts may occur at context level and adaptation rule level. Many researchers presented different methods to detect and resolve conflict in context information level. In this work we proposed a procedure to detect and resolve conflicts in the adaptation. Two different types of conflicts are addressed in this work. We have discussed about the procedure to resolve these two types of conflicts in the adaptation rule.