diff --git a/src/app/models/feedback.ts b/src/app/models/feedback.ts
new file mode 100644
index 0000000..88bccda
--- /dev/null
+++ b/src/app/models/feedback.ts
@@ -0,0 +1,5 @@
+export interface Feedback {
+    name: string;
+    contactEmailAddress: string;
+    feedback: string;
+}
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 0f9753b..5f3ea08 100644
--- a/src/index.html
+++ b/src/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <title>Angular Getting Started</title>
+    <title>Intended merge conflict</title>
     <base href="/" />
 
     <meta name="viewport" content="width=device-width, initial-scale=1" />
