- Fix merging errors made in the RPi