Resovle conflict2