diff --git a/C4S_UPDATE b/C4S_UPDATE
index 420a01b82..cde66cfff 100644
--- a/C4S_UPDATE
+++ b/C4S_UPDATE
@@ -1,26 +1,26 @@
 Update c4science branch from upstream
 -------------------------------------
 
 # Get changes and merge
 git fetch upstream
 git merge --squash upstream/stable
 
-# Fix conflict
-vim $(grep -rl '<<<<<<<' --exclude-dir=.git)
-
-# Copy files from upstream if needed
+# Copy files from upstream when they don't have c4s custo
 for i in $(grep -rl '<<<<<<<' --exclude-dir=.git); do
     grep -rnl c4s $i > /dev/null || cp ../PH-UPSTREAM/$i $i
 done
 
+# Fix conflict
+vim $(grep -rl '<<<<<<<' --exclude-dir=.git)
+
 # Commit and push
 git commit -am "Merge with Stable Week XXX"
 git push origin stable
 
 DEBUG
 -----
 
 # Check all the differences with the upstream branch
 git fetch upstream
 git diff --diff-filter=a upstream/stable..HEAD