resolve buff conflict