dependabot version change and merge conflict resolution in docs

Author: robertpatrick

Diff for: documentation/4.0/content/release-notes/release-3.5.2.md

@@ -1,20 +1,12 @@
 +++
 title = "Release 3.5.2"
 date = 2019-02-22T15:27:38-05:00
-<<<<<<< HEAD:documentation/3.0/content/release-notes/release-3.5.2.md
 weight = 77
-=======
-weight = 75
->>>>>>> develop-4.0:documentation/4.0/content/release-notes/release-3.5.2.md
 pre = "<b> </b>"
 +++
 
 
-<<<<<<< HEAD:documentation/3.0/content/release-notes/release-3.5.2.md
 ### Changes in Release 3.5.2
-=======
-### Changes in Release 3.5.4
->>>>>>> develop-4.0:documentation/4.0/content/release-notes/release-3.5.2.md
 - [Major New Features](#major-new-features)
 - [Other Changes](#other-changes)
 - [Bugs Fixes](#bug-fixes)
@@ -25,21 +17,12 @@ pre = "<b> </b>"
 None
 
 #### Other Changes
-<<<<<<< HEAD:documentation/3.0/content/release-notes/release-3.5.2.md
 - #1557 - Added support for provisioning the WebLogic Remote Console domain extension WAR file.
 
 #### Bug Fixes
 - #1547 -  Fixed a bug with password validation causing a `NullPointerException` when the `domainInfo` section was
   missing from the model.
 - #1554 - Fixed a problem where the Discover Domain tool would hang when running in online mode and an edit lock exists.
-=======
-- #1600 - Added alias updates to support the Jan 2024 PSUs.
-
-#### Bug Fixes
-- #1607 - Fixed an issue with assigning groups to parent groups.
-- #1620 - Fixed an issue that caused an attribute with the WLST value `none` to be interpreted as a Python `None`.
-- #1635 - Fixed an issue with the `ResourceManagement` attribute in WebLogic Server 14.1.1 and higher.
->>>>>>> develop-4.0:documentation/4.0/content/release-notes/release-3.5.2.md
 
 #### Known Issues
 None

Diff for: documentation/4.0/content/release-notes/release-3.5.3.md

@@ -18,26 +18,15 @@ None
 
 #### Other Changes
 - #1573 - Enhanced the `wlsdeploy.debugToStdout` system property to also include exception stacktraces when set to `true`.
-<<<<<<< HEAD:documentation/3.0/content/release-notes/release-3.5.3.md
           This will help WebLogic Kubernetes Operator users running into WDT issues to see the details normally hidden in
           the log files.
-=======
-  This will help WebLogic Kubernetes Operator users running into WDT issues to see the details normally hidden in
-  the log files.
->>>>>>> develop-4.0:documentation/4.0/content/release-notes/release-3.5.3.md
 
 #### Bug Fixes
 - #1561 - Fixed a NullPointerException when there is missing fields in the `RCUDbInfo` section.
 - #1590 - Fixed an issue with the `ServiceProviderSingleLogoutRedirectUri` attribute in the October 2023 PSUs for
-<<<<<<< HEAD:documentation/3.0/content/release-notes/release-3.5.3.md
           12.2.1.4 and 14.1.1 that was causing an error.
 - #1590 - Fixed an issue with exception creation in 14.1.1 that was causing error messages not to be properly populated
           due to Jython 2.7.1 vararg method binding being broken.
-=======
-  12.2.1.4 and 14.1.1 that was causing an error.
-- #1590 - Fixed an issue with exception creation in 14.1.1 that was causing error messages not to be properly populated
-  due to Jython 2.7.1 vararg method binding being broken.
->>>>>>> develop-4.0:documentation/4.0/content/release-notes/release-3.5.3.md
 
 #### Known Issues
 None

Diff for: pom.xml

@@ -268,7 +268,7 @@
                 <plugin>
                     <groupId>org.jacoco</groupId>
                     <artifactId>jacoco-maven-plugin</artifactId>
-                    <version>0.8.11</version>
+                    <version>0.8.12</version>
                     <executions>
                         <execution>
                             <id>prepare-agent</id>