diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..6f3a291
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "liveServer.settings.port": 5501
+}
\ No newline at end of file
diff --git a/styles/global.css b/styles/global.css
index c14757d..f2c0385 100644
--- a/styles/global.css
+++ b/styles/global.css
@@ -39,7 +39,6 @@
 *::before,
 *::after {
   box-sizing: border-box;
-  padding: 0;
   margin: 0;
 }
 
@@ -62,9 +61,14 @@ img {
 h1 {
   line-height: 1.25;
   text-wrap: balance;
+  margin-bottom: 1rem;
 }
 
 p {
+<<<<<<< HEAD:styles/style.css
+  line-height: 1.5;
+  text-align: center;
+=======
   text-wrap: pretty;
   font-family: var(--ff-normal);
 }
@@ -76,6 +80,7 @@ li {
 strong {
   font-family: var(--ff-shin-go-pro);
   line-height: 1.25;
+>>>>>>> eebba7339bc78dd490608e6b759132562d329081:styles/global.css
 }
 
 a {