Cleanup grammar for conflict message
Cleanup grammar for conflict message and respect style(9)