s/r conflict eliminated