Resolve conflitcs and update pv #94

Job	Run time
Gradle Build	3m 49s
Build Examples	4m 23s
PhotonClient Build	44s
Build Offline Docs	39s
Photonlib - Build Docker - Athena	5m 20s
Photonlib - Build Host - Win64	8m 58s
Photonlib - Build Docker - Raspbian	5m 41s
Photonlib - Build Host - macOS	4m 33s
Photonlib - Build Docker - Aarch64	6m 9s
Photonlib - Build Host - Linux	5m 7s
Build fat JAR - Win64	1m 59s
Build fat JAR - macOS	3m 30s
Build fat JAR - macOSArm	3m 30s
Build fat JAR - Linux	1m 39s
Build fat JAR - LinuxArm64	1m 13s
run-smoketest-native (ubuntu-latest, jar-Linux, -Djdk.lang.Process.launchMechanism=vfork)	15s
smoketest-RaspberryPi	56s
Build image - ${{ matrix.image_url }}	0s
run-smoketest-native (windows-latest, jar-Win64)	17s
run-smoketest-native (macos-latest, jar-macOS, x64)	17s
Combine	11s
release	0s
	59m 10s

Provide feedback