Boris: Update conflict markers.
SWI-Prolog: Fix build (OpenSSL rampage).