user wall powers activate
resolve merge conflict