undo astyle changes to clean up the diff with master