The standard XD code formatter options don't like this format, it becomes...

    private int batchSize;

    private final RingBuffer ringBufffer;

Did anyone come up with IDEA formatter rules to match the STS rules?

I guess the merger can re-save all the files when merging.