conflict with powerleft resolved