fixed r/r conflict in grammar