Merge conflict with ddnet/pulls/5033

[ChillerDragon]

Failed to merge https://github.com/ddnet/ddnet/pull/5033 into chillerbot

$ git status
On branch updatebot-test-pull-chillerbot
You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

Changes to be committed:
    modified:   .github/workflows/build.yaml
    modified:   .github/workflows/clang-sanitizer.yml
    modified:   .github/workflows/clang-tidy.yml
    modified:   .github/workflows/codeql-analysis.yaml
    modified:   .github/workflows/style.yml
    new file:   cmake/FindLibSodium.cmake
    modified:   src/engine/client/client.cpp
    new file:   src/engine/encryption.h
    modified:   src/engine/server/server.cpp
    new file:   src/engine/shared/encryption.cpp

Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   CMakeLists.txt

Conflicts:

CMakeLists.txt
)
set(DEPS ${DEP_JSON} ${DEP_MD5} ${ZLIB_DEP})

# Libraries
set(LIBS
  ${CRYPTO_LIBRARIES}
  ${SQLite3_LIBRARIES}
  ${WEBSOCKETS_LIBRARIES}
  ${ZLIB_LIBRARIES}
  ${PLATFORM_LIBS}
<<<<<<< HEAD
  ${CURSES_LIBRARIES}
=======
  ${LIBSODIUM_LIBRARIES}
>>>>>>> updatebot-test-pull-ddnet
  # Add pthreads (on non-Windows) at the end, so that other libraries can depend
  # on it.
  ${CMAKE_THREAD_LIBS_INIT}
)

# Targets

[ChillerDragon]

Yea this is chill :)