Resovle conflict