diff --git a/HelloStudents/HelloStudents.csproj b/HelloStudents/HelloStudents.csproj
index 1428d59..13782de 100644
--- a/HelloStudents/HelloStudents.csproj
+++ b/HelloStudents/HelloStudents.csproj
@@ -54,9 +54,13 @@
     <Compile Include="Student3103Kim.cs" />
     <Compile Include="Student3116JO.cs" />
     <Compile Include="Student3199Ham.cs" />
+<<<<<<< HEAD
+    <Compile Include="Student3208Kim.cs" />
+=======
     <Compile Include="Student3209Moon.cs" />
     <Compile Include="Student3214Lee.cs" />
     <Compile Include="Student3211Son.cs" />
+>>>>>>> d71a868d626d43bd81a61c36d8bd67045cf3f0de
     <Compile Include="StudentBase.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/HelloStudents/Program.cs b/HelloStudents/Program.cs
index 50ee58c..24fd2f6 100644
--- a/HelloStudents/Program.cs
+++ b/HelloStudents/Program.cs
@@ -93,6 +93,15 @@ static void Main(string[] args)
             // 3206
             // 3207
             // 3208
+            students.Add(
+                new Student3208Kim()
+                {
+                    FirstName = "연희",
+                    LastName = "김",
+                    StudentNumber=3208,
+                    BaseYear=2021
+                }
+            );
             // 3209
             students.Add(
                new Student3209Kim()
diff --git a/HelloStudents/Student3208Kim.cs b/HelloStudents/Student3208Kim.cs
new file mode 100644
index 0000000..0871f19
--- /dev/null
+++ b/HelloStudents/Student3208Kim.cs
@@ -0,0 +1,17 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace HelloStudents
+{
+
+    class Student3208Kim : StudentBase
+    {
+        public override string Hello()
+        {
+            return "무야호~ 나는 " + this + "입니다";
+        }
+    }
+}