From f26aa7dff7e998b9f72ae31e7d34d0bdb625437b Mon Sep 17 00:00:00 2001
From: Sam Becker <sam@sambecker.com>
Date: Mon, 17 Feb 2025 19:22:15 -0600
Subject: [PATCH] Add app refactor question to FAQ

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index d9f1b6b7..bd6a9635 100644
--- a/README.md
+++ b/README.md
@@ -302,3 +302,6 @@ Vercel Postgres can be switched to another Postgres-compatible, pooling provider
 
 #### Can this template run in a docker image?
 > Possibly. See [Issue #116](https://github.com/sambecker/exif-photo-blog/issues/116) for discussion.
+
+#### Why am I seeing many merge conflicts when syncing my fork?
+> Previous versions of this template stored "app directory" files in `/src`, and key functionality in `/src/site`. If you've made customizations and are having difficulty merging updates, consider moving your `/src/app` files to `/`, and renaming `src/site` to `/src/app`. Other structural changes include moving `tailwind.css` and `middleware.ts` to `/`. Lastly, it may be helpful to review [PR #195](https://github.com/sambecker/exif-photo-blog/pull/195) for an overview of the most significant changes.