conflicts resolve(not end)