K 10 svn:author V 3 mat K 8 svn:date V 27 2018-01-25T16:21:52.263023Z K 7 svn:log V 65 Rewrite the Conflicts Handling section. Sponsored by: Absolight END