Resolve merge conflict

FROM nextcloud:26.0.8-fpm AS nextcloud

ARG BASE_DIR="/usr/src/nextcloud"

ARG TMP_PATCH_DIR="/tmp/build_patches"

ARG THEME_HELPER_JOB_ID="812372"

ARG THEME_HELPER_JOB_ID="824758"

ARG NOTES_VERSION="4.9.2"

ARG CONTACTS_JOB_ID="740210"

ARG CONTACTS_JOB_ID="821699"

ARG CALENDAR_JOB_ID="812355"

ARG EMAIL_RECOVERY_JOB_ID="738840"

ARG EA_JOB_ID="738865"

RUN cd ${BASE_DIR}/custom_apps/notes && sed -i 's/<step>OCA\\Notes\\Migration\\EditorHint<\/step>//g' appinfo/info.xml

RUN cd ${BASE_DIR}/apps/theming && sed -i 's/<step>OCA\\Theming\\Migration\\MigrateUserConfig<\/step>//g' appinfo/info.xml

# sharing search by email

RUN cd ${BASE_DIR}/custom_apps/contacts && sed -i 's/$S.principalPropertySearchByDisplayname(t);/$S.principalPropertySearch(\[{name:\["http:\/\/sabredav.org\/ns","email-address"\]\}],t,"anyof");/g' js/contacts-main.js

#enable email search in memories app

RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/shareTypes:\[bc\.D\.SHARE_TYPE_USER,bc\.D\.SHARE_TYPE_GROUP\]}});/shareTypes:[bc.D.SHARE_TYPE_USER,bc.D.SHARE_TYPE_EMAIL]}}),n=e.data.ocs.data.filter((e=>"emails"!==e.source)),r={data:{ocs:{meta:e.data.ocs.meta,data:n}}};/g' js/memories-main.js

RUN cd ${BASE_DIR}/custom_apps/memories && sed -i 's/this\.currentSearchResults=e\.data\./this\.currentSearchResults=r\.data\./g' js/memories-main.js

# Remove colored background from email template logo

RUN sed -i 's/$this->header, \[$this->themingDefaults->getDefaultColorPrimary()/$this->header, \["none"/' ${BASE_DIR}/lib/private/Mail/EMailTemplate.php