resovle conflicts