* Add a rule to toggle space after opening brace and before closing brace * Make the added format option optional * Fix merge issues