Resolve conflitcs and update pv #95

Job	Run time
Build Examples	5m 32s
PhotonClient Build	37s
Gradle Build	3m 44s
Build Offline Docs	38s
Photonlib - Build Docker - Athena	5m 25s
Photonlib - Build Docker - Raspbian	5m 30s
Photonlib - Build Docker - Aarch64	6m 18s
Photonlib - Build Host - Win64	8m 37s
Photonlib - Build Host - macOS	3m 41s
Photonlib - Build Host - Linux	5m 4s
Build fat JAR - Win64	1m 54s
Build fat JAR - macOS	3m 23s
Build fat JAR - macOSArm	3m 52s
Build fat JAR - Linux	1m 34s
Build fat JAR - LinuxArm64	1m 44s
run-smoketest-native (ubuntu-latest, jar-Linux, -Djdk.lang.Process.launchMechanism=vfork)	26s
run-smoketest-native (windows-latest, jar-Win64)	21s
smoketest-RaspberryPi	1m 7s
run-smoketest-native (macos-latest, jar-macOS, x64)	17s
Build image - ${{ matrix.image_url }}	0s
Combine	12s
release	0s
	59m 56s

Provide feedback