diff --git a/All4.tex b/All4.tex
old mode 100755
new mode 100644
diff --git a/book-1/Synopsis.md b/book-1/Synopsis.md
old mode 100755
new mode 100644
diff --git a/book-1/all.tex b/book-1/all.tex
old mode 100755
new mode 100644
diff --git a/book-1/background.jpg b/book-1/background.jpg
old mode 100755
new mode 100644
diff --git a/book-1/structure.tex b/book-1/structure.tex
old mode 100755
new mode 100644
diff --git a/book-2/1.tex b/book-2/1.tex
old mode 100755
new mode 100644
diff --git a/book-2/Main.tex b/book-2/Main.tex
old mode 100755
new mode 100644
diff --git a/book-2/all.tex b/book-2/all.tex
old mode 100755
new mode 100644
diff --git a/book-2/background.jpg b/book-2/background.jpg
old mode 100755
new mode 100644
diff --git a/book-2/structure.tex b/book-2/structure.tex
old mode 100755
new mode 100644
diff --git a/book-3/1.tex b/book-3/1.tex
old mode 100755
new mode 100644
diff --git a/book-3/Main.tex b/book-3/Main.tex
old mode 100755
new mode 100644
diff --git a/book-3/all.tex b/book-3/all.tex
old mode 100755
new mode 100644
diff --git a/book-3/structure.tex b/book-3/structure.tex
old mode 100755
new mode 100644
diff --git a/book-4/1.tex b/book-4/1.tex
old mode 100755
new mode 100644
diff --git a/book-4/Main.tex b/book-4/Main.tex
old mode 100755
new mode 100644
diff --git a/book-4/all.tex b/book-4/all.tex
old mode 100755
new mode 100644
diff --git a/book-4/structure.tex b/book-4/structure.tex
old mode 100755
new mode 100644
diff --git a/render.sh b/render.sh
old mode 100755
new mode 100644
index 0ba946d..26bfcca
--- a/render.sh
+++ b/render.sh
@@ -31,8 +31,4 @@ cd ../book-4
 /usr/bin/pdflatex -file-line-error -interaction nonstopmode -jobname=Book4 "Main.tex"
 /usr/bin/pdflatex -file-line-error -interaction nonstopmode -jobname=Book4 "Main.tex"
 rm Book4.aux Book4.out Book4.toc
-<<<<<<< HEAD
 mv Book4.pdf /home/david/fileshare/Anders/
-=======
-mv Book4.pdf /home/david/fileshare/Anders/
->>>>>>> dev
diff --git a/structure.tex b/structure.tex
old mode 100755
new mode 100644