diff --git a/composeApp/src/commonMain/composeResources/files/ews-376.txt b/composeApp/src/commonMain/composeResources/files/ews-376.txt
index a8d3cc1..c2ff945 100644
--- a/composeApp/src/commonMain/composeResources/files/ews-376.txt
+++ b/composeApp/src/commonMain/composeResources/files/ews-376.txt
@@ -1,9 +1,9 @@
-M0:|T:What a day of victory|t:EWS 376 When at last we see the King|r:P.M|c:G|m:4/4|a:James Rowe 1865-1933|h:Charles Hutchinson Gabriel 1856-1932|u:https://hymnary.org/hymn/D1916/page/48
-U0:zC:y yy4y yy4y 44ty C/ yyy4 yyy4 y44t yC/ y62tt 624y 62ty (822) yyy4y yy4 y44tyC
+M0:|T:What a day of victory|t:EWS 376 When at last we see the King|r:P.M|c:Ab|m:4/4|a:James Rowe 1865-1933|h:Charles Hutchinson Gabriel 1856-1932|u:https://hymnary.org/hymn/D1916/page/48
+U0:zC:y yy4/y yy4/y 44ty C/ yyy4/ yyy4/ y44t yC/ y62tt 624/y 62ty (822)/ yyy4/y yy4/ y44tyC
 N1:drmmmfmmrdddrddl,s,dmRmssrdrmmmfmmrdddrddl,s,ssmdmrdmssssmdsmdlssmfsssmdmmr--drmmmfmmrdddrddl,s,ssmdmrd
-N2:s,t,ddddds,s,l,l,l,l,l,l,f,m,s,s,F,F,s,s,s,s,t,ddddds,s,l,l,l,l,l,m,f,s,t,dddl,t,s,s,dt,drddt,dddt,dddrdt,t,dddt,--l,l,dddl,s,S,t,t,l,l,l,l,m,f,s,t,dddt,t,d
-N3:mfssllsdrmmffmmddddddrmt,mfssllsdrmmffmdrmfsslsfmmsfmsmffmsffsslsmrsssss--mfsrdddmmmmffmdrmfsFFffm
-N4:mrdt,l,f,ddt,l,s,f,r,l,l,f,d,m,s,l,dt,ds,mrdt,l,f,ddt,l,s,f,r,l,l,t,drmmfss,d,dmrdt,dfrmmfrmdl,t,ds,s,m,d,d,s,l,f,dt,l,f,d,m,m,l,s,f,r,l,l,t,drml,l,s,s,d,
+N2:#m, mfs3ls3l6f mmsFs4mfs3ls3 l6fms5fm sd4ssdssd3ss d3s5--s5ls3 l6fms5fm
+N3:#t, d9f6d d5mdtd9 f6ddmmdmdtd dm4dmmdmfmmdr m3dmddt--dtd7 f6ddmmdmdtd
+N4:#d, d8mf7 ddd'4msd8m f7dd'4ssd d'10fd'4 d'7ssfmrd6m f7dd'4ssd
 E1:When at last we see the King /and His praise in glo_ry sing,/What a day of vic_to_ry that will be!/When we reach the oth_er side /where the faith_ful shall ab_ide,/What a day of vic_to_ry that will be!/${R=}What a day of vic_to_ry, vic_to_ry, vic_to_ry!/What a day of vic_to_ry that will be!/When ho_san_nas glad we sing /in the pa_lace of the King,/What a day of vic_to_ry that will be!
 E2:When we walk the streets of gold /with the hap_py saints of old,/What a day of vic_to_ry that will be!/When we join the an_gel-_throng /in the ev_er_last_ing song,/What a day of vic_to_ry that will be!
 E3:When with tri_als tru_ly past /we re_ceive the crown at last,/What a day of vic_to_ry that will be!/When be_fore the King we stand /in that ev_er_last_ing land,/What a day of vic_to_ry that will be!/
diff --git a/composeApp/src/commonMain/composeResources/files/ffpm-440-1.txt b/composeApp/src/commonMain/composeResources/files/ffpm-440-1.txt
index 6ec6d03..9acab79 100644
--- a/composeApp/src/commonMain/composeResources/files/ffpm-440-1.txt
+++ b/composeApp/src/commonMain/composeResources/files/ffpm-440-1.txt
@@ -1,4 +1,8 @@
+<<<<<<< Updated upstream
 M0:|c:A|m:4/4|r:C.M.|t:FFPM 440 (1) Ry Kristy ô, Mpanjakako|n:19|l:15|a:Ralaikera|h:
+=======
+M0:|c:A|m:4/4|r:C.M.|t:FFPM 440 (1) Ry Kristy ô, Mpanjakako|n:19|l:15|a:J. Ralaikera|h:
+>>>>>>> Stashed changes
 S0:/:|!
 T0:{|s:d.,r!m:-.m|(r.r):(r.t)!d:-.s|l:s!s:(f.d)|s:-!-:-/s:d.,r!m:-.m|(f.r):(r.t)!d:-.s|(s.f):-.(m,r)!d:(t.f)|d:-!-:-}
 N1:s,drmmfrrt,ds,l,s,s,F,-s,/s,drmmfrrt,ds,l,fmrdt,-d