Resolve conflitcs and update pv #93

Job	Run time
PhotonClient Build	38s
Build Examples	4m 42s
Gradle Build	3m 52s
Build Offline Docs	38s
Photonlib - Build Docker - Athena	5m 23s
Photonlib - Build Docker - Raspbian	5m 39s
Photonlib - Build Docker - Aarch64	6m 18s
Photonlib - Build Host - Win64	8m 41s
Photonlib - Build Host - macOS	4m 0s
Photonlib - Build Host - Linux	4m 37s
Build fat JAR - Win64	1m 51s
Build fat JAR - macOS	3m 35s
Build fat JAR - macOSArm	3m 53s
Build fat JAR - Linux	1m 35s
Build fat JAR - LinuxArm64	1m 31s
smoketest-RaspberryPi	1m 4s
run-smoketest-native (ubuntu-latest, jar-Linux, -Djdk.lang.Process.launchMechanism=vfork)	23s
Build image - ${{ matrix.image_url }}	0s
run-smoketest-native (windows-latest, jar-Win64)	13s
run-smoketest-native (macos-latest, jar-macOS, x64)	15s
Combine	19s
release	0s
	59m 7s

Provide feedback