diff --git a/web/concrete/config/app.php b/web/concrete/config/app.php
index <HASH>..<HASH> 100644
--- a/web/concrete/config/app.php
+++ b/web/concrete/config/app.php
@@ -234,10 +234,7 @@ if (!defined('UPLOAD_FILE_EXTENSIONS_ALLOWED')) {
 } else {
 	define('UPLOAD_FILE_EXTENSIONS_CONFIGURABLE', false);
 }
-<<<<<<< HEAD
-=======
 
 if (!defined('SEO_EXCLUDE_WORDS')) {
 	Config::getOrDefine('SEO_EXCLUDE_WORDS', 'a, an, as, at, before, but, by, for, from, is, in, into, like, of, off, on, onto, per, since, than, the, this, that, to, up, via, with');
-}
->>>>>>> 0a5729a... finished up the seo excluded words
+}
\ No newline at end of file
resolved cherry-pick conflict


Former-commit-id: c2f<I>c<I>d6a<I>c9ad<I>b<I>c3c<I>d2f<I>f