Resolve conflitcs and update pv #97

Job	Run time
Build Examples	4m 19s
PhotonClient Build	38s
Gradle Build	3m 51s
Build Offline Docs	47s
Photonlib - Build Docker - Athena	5m 35s
Photonlib - Build Docker - Raspbian	5m 36s
Photonlib - Build Host - Win64	8m 40s
Photonlib - Build Docker - Aarch64	6m 11s
Photonlib - Build Host - macOS	3m 53s
Photonlib - Build Host - Linux	4m 58s
Build fat JAR - Win64	2m 7s
Build fat JAR - macOS	3m 53s
Build fat JAR - macOSArm	3m 56s
Build fat JAR - Linux	1m 28s
Build fat JAR - LinuxArm64	1m 19s
smoketest-RaspberryPi	1m 6s
run-smoketest-native (ubuntu-latest, jar-Linux, -Djdk.lang.Process.launchMechanism=vfork)	26s
Build image - ${{ matrix.image_url }}	0s
run-smoketest-native (windows-latest, jar-Win64)	12s
run-smoketest-native (macos-latest, jar-macOS, x64)	15s
Combine	16s
release	0s
	59m 26s

Provide feedback