Resolve merge conflict

ksaketou · ksaketou · commit bf9ebd63603d · 2021-05-17T16:03:37.000+03:00
diff --git a/ChangeLog b/ChangeLog
@@ -39,6 +39,7 @@ modules are added.
   names of overridden functions.
 
   Closes #3536
+
 * New checker ``consider-using-dict-items``. Emitted  when iterating over dictionary keys and then
   indexing the same dictionary with the key within loop body.
 
