diff --git a/view-webapp/src/main/webapp/WEB-INF/translations/kr b/view-webapp/src/main/webapp/WEB-INF/translations/kr
index e401b4a..6b3d4b7 100644
--- a/view-webapp/src/main/webapp/WEB-INF/translations/kr
+++ b/view-webapp/src/main/webapp/WEB-INF/translations/kr
@@ -227,19 +227,11 @@ Secondary parameters	부가 설정
 Geographical parameters	지리적 설정
 Handicap parameters	핸디캡 설정
 deterministic randomness	결정적 무작위성
-<<<<<<< e8943b690eca2a284ab2fabd0d014fb77981af21
 Randomness:	무작위성
 none	없음
 deterministic	결정적
 non-deterministic	비결정론적
 balance white and black	점 차이를 선호
-=======
-Randomness	무작위성
-none	없음
-deterministic	없음
-non-deterministic	비결정론적
-balance white and black	
->>>>>>> 5528e07f8e0cdda908847577340c595e9d2df8aa
 Round 	 
 down	내림
 up	올림