diff --git a/dictsource/de_list b/dictsource/de_list
index 3f4caa2f..1d10a2a9 100644
--- a/dictsource/de_list
+++ b/dictsource/de_list
@@ -51,8 +51,6 @@ _<	klaIn3
 _>	grY:s3
 _«	'anfy:RUNsts,aIC@n
 _»	'anfy:RUNsts,aIC@n||ts'u:
-_„	l'INk@s_!,anfy:RUNsts,aIC@n
-_”	@-r'ECt@s_!,anfy:RUNsts,aIC@n
 _`	grA:v
 _^	tsIrkUmflEks
 _—	g@d'aNk@nStr,IC
diff --git a/dictsource/sl_list b/dictsource/sl_list
index 2fd22579..9afbc88a 100644
--- a/dictsource/sl_list
+++ b/dictsource/sl_list
@@ -28,19 +28,11 @@ _z	z@
 ž	Z@
 
 q	ku
-<<<<<<< HEAD
-w	dv'ojniv,@
-x	iks
-y	'ipsilon
-ć	m'ehkitS,@
-đ	m'ehkidZ,@
-=======
 w	dv#'ojniv,@
 x	iks
 y	'ipsilon
 ć	m'ehkitS,@
 đ	dZ@
->>>>>>> upstream
 
 ä	$accent
 ë	$accent
@@ -54,11 +46,7 @@ _dia	'umlawt
 // numbers
 _0	n'itS
 _1	'ena
-<<<<<<< HEAD
-_2	dv'a
-=======
 _2	dv#'a
->>>>>>> upstream
 _3	tR'i
 _4	St'iRi
 _5	p'et
@@ -68,11 +56,7 @@ _8	'osem
 _9	d'evet
 _10	d'eset
 _11	'e'najst
-<<<<<<< HEAD
-_12	dv'anajst
-=======
 _12	dv#'anajst
->>>>>>> upstream
 _13	tR'inajst
 _14	St'iRinajst
 _15	p'etnajst
@@ -80,11 +64,7 @@ _16	S'estnajst
 _17	s'edemnajst
 _18	'osemnajst
 _19	d'evetnajst
-<<<<<<< HEAD
-_2X	dv'ajset
-=======
 _2X	dv#'ajset
->>>>>>> upstream
 _3X	tR'ideset
 _4X	St'iRideset
 _5X	p'etdeset
@@ -98,31 +78,19 @@ _0M1	t'isotS
 _1M1	t'isotS
 
 _1M2	'enmilij'on
-<<<<<<< HEAD
-_2M2	dv'amilij'ona
-=======
 _2M2	dv#'amilij'ona
->>>>>>> upstream
 _3M2	tR'ijemilij'oni
 _4M2	St'iRijemilij'oni
 _0M2	milij'onow
 
 _1M3	'enamilij'aRda
-<<<<<<< HEAD
-_2M3	dv'emilij'aRdi
-=======
 _2M3	dv#'emilij'aRdi
->>>>>>> upstream
 _3M3	tR'imilij'aRde
 _4M3	St'iRimilij'aRde
 _0M3	milij'aRd
 
 _1M4	'enbilij'on
-<<<<<<< HEAD
-_2M4	dv'abilij'ona
-=======
 _2M4	dv#'abilij'ona
->>>>>>> upstream
 _3M4	tR'ijebilij'oni
 _4M4	St'iRijebilij'oni
 _0M4	bilij'onow
diff --git a/dictsource/sl_rules b/dictsource/sl_rules
index 07038a55..b6604cff 100644
--- a/dictsource/sl_rules
+++ b/dictsource/sl_rules
@@ -69,11 +69,7 @@
         m        m
         m (g     N
         m (k     N
-<<<<<<< HEAD
-     K) m (K     %@m  // unstressed
-=======
      K) m (K     m@-  // unstressed
->>>>>>> upstream
 
 
 .group n
@@ -81,11 +77,7 @@
         n (g     N
         n (k     N
 
-<<<<<<< HEAD
-     K) n (K     %@n  // unstressed
-=======
      K) n (K     n@-  // unstressed
->>>>>>> upstream
         nj       n^
         nj (A    nj
         nj (i    n^
@@ -93,10 +85,7 @@
 
 .group o
         o        o
-<<<<<<< HEAD
-=======
      _) o        O
->>>>>>> upstream
 
 
 .group p
@@ -139,20 +128,11 @@
         v (-A+   v    // preposition 'v' before a vowel
      A) v (K     w
      K) v (K     %u
-<<<<<<< HEAD
-   L01) v (A     w
-
-
-.group w
-        w        v
-     A) w (K     w
-=======
    L01) v (A     v#
 
 
 .group w
         w        w
->>>>>>> upstream
 
 
 .group x
diff --git a/phsource/ph_slovenian b/phsource/ph_slovenian
index 9a24a741..436e8c5c 100644
--- a/phsource/ph_slovenian
+++ b/phsource/ph_slovenian
@@ -30,14 +30,14 @@ endphoneme
 phoneme e
   vowel starttype #e endtype #e
   length 160
-  FMT(vowel/e)
+  FMT(vowel/e_2)
 endphoneme
 
 
 phoneme E
   vowel starttype #e endtype #e
   length 160
-  FMT(vowel/ee_1)
+  FMT(vowel/e_mid)
 endphoneme
 
 
@@ -45,14 +45,14 @@ endphoneme
 phoneme o
   vowel starttype #o endtype #o
   length 160
-  FMT(vowel/o)
+  FMT(vowel/o_8)
 endphoneme
 
 
 phoneme O
   vowel starttype #o endtype #o
   length 170
-  FMT(vowel/oo_5)
+  FMT(vowel/0_2)
 endphoneme
 
 
diff --git a/phsource/vowelcharts/sl b/phsource/vowelcharts/sl
index d6fc804c..06a2cd91 100644
--- a/phsource/vowelcharts/sl
+++ b/phsource/vowelcharts/sl
@@ -1,11 +1,12 @@
 @	 0 525 1441 2340   525 1441 2340
+@-	 0 525 1441 2340   525 1441 2340
 a	 0 904 1320 2700   896 1340 2660
-e	 0 456 1980 2540   440 1980 2540
+e	 0 416 2140 2660   416 2140 2660
 i	 0 360 2120 2680   360 2120 2660
-o	 0 454  812 2559   432  824 2520
+o	 0 412  760 2680   412  760 2680
 u	 0 344  800 2360   344  800 2360
-E	 0 720 1760 2420   672 1562 2520
-O	 0 536  920 2600   536  920 2600
+E	 0 584 1820 2560   584 1820 2560
+O	 0 630  920 2627   616  940 2627
 y	 0 408 1760 2540   408 1760 2540
 i:	 0 272 2247 3100   288 2247 3100
 e:	 0 584 1820 2560   584 1820 2560
diff --git a/phsource/vowelcharts/sl.png b/phsource/vowelcharts/sl.png
index 5e571006..46408edb 100644
Binary files a/phsource/vowelcharts/sl.png and b/phsource/vowelcharts/sl.png differ