fixing conflict

Created by  tae  on September 18, 2025
UJ35PJ5Y3GAWQNWFUV4XWX3USYF7YDGS3BIVKXCGFCCPAOSARIQQC
Change contents