Updating diktat to 1.2.1 and it's the configuration

[orchestr7]

And same for detekt

[orchestr7]

@CommanderTvis answering your question

[nbirillo]

@akuleshov7 could you please resolve the conflicts?

[orchestr7]

@akuleshov7 could you please resolve the conflicts?

sure, but let's wait until the release of 1.2.2 release - we have added small mechanism to merge reports as @CommanderTvis requested. Should be released this week :)