powermanagement plugin changed
conflict merged