Modified grammar to remove conflict.