Fix conflict

diff --cc scripts/shaderlist.txt
index 4cff15d02f11f1e1842f4eaadfa40c4f67b00eb2,3892df04d035c1a2e52975adfaaf6fcb43e07348..6b58337f40eaafd3b966f17d14dbd2d53d9fdaad
--- 1/scripts/shaderlist.txt
--- 2/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@@ -19,7 -18,8 +18,9 @@@ liquids_lav
  liquids_slime
  liquids_water
  logos
 +map_aurora
+ map_atelier
+ map_boil
  map_catharsis
  map_courtfun
  map_darkzone