diff --git a/.vagrant/machines/default/virtualbox/action_provision b/.vagrant/machines/default/virtualbox/action_provision
index 8a8b7a899..1b09c2262 100644
--- a/.vagrant/machines/default/virtualbox/action_provision
+++ b/.vagrant/machines/default/virtualbox/action_provision
@@ -1 +1,2 @@
-1.5:558bbbdc-672d-4236-b18d-0747cd5fbeaf
\ No newline at end of file
+
+1.5:0a8e3252-0dfa-4c2d-93e4-132058372cdb
diff --git a/.vagrant/machines/default/virtualbox/action_set_name b/.vagrant/machines/default/virtualbox/action_set_name
index 355d3ffd5..59eaf4275 100644
--- a/.vagrant/machines/default/virtualbox/action_set_name
+++ b/.vagrant/machines/default/virtualbox/action_set_name
@@ -1 +1,2 @@
-1745624815
\ No newline at end of file
+
+1745717021
diff --git a/.vagrant/machines/default/virtualbox/id b/.vagrant/machines/default/virtualbox/id
index 482b8e564..ec93d932f 100644
--- a/.vagrant/machines/default/virtualbox/id
+++ b/.vagrant/machines/default/virtualbox/id
@@ -1 +1 @@
-558bbbdc-672d-4236-b18d-0747cd5fbeaf
\ No newline at end of file
+0a8e3252-0dfa-4c2d-93e4-132058372cdb
diff --git a/.vagrant/machines/default/virtualbox/index_uuid b/.vagrant/machines/default/virtualbox/index_uuid
index e971e5dac..3682df743 100644
--- a/.vagrant/machines/default/virtualbox/index_uuid
+++ b/.vagrant/machines/default/virtualbox/index_uuid
@@ -1 +1 @@
-400cd81ad83347cf828ce0bd43022163
\ No newline at end of file
+400cd81ad83347cf828ce0bd43022163
diff --git a/.vagrant/machines/default/virtualbox/private_key b/.vagrant/machines/default/virtualbox/private_key
index 205453936..16eb9c4b7 100644
--- a/.vagrant/machines/default/virtualbox/private_key
+++ b/.vagrant/machines/default/virtualbox/private_key
@@ -1,8 +1,10 @@
 -----BEGIN OPENSSH PRIVATE KEY-----
 b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAA
-AAtzc2gtZWQyNTUxOQAAACBNkoyert5NF60C2rjOy+AILyPoPkGR2q4Fc/Om
-nfAeXQAAAJCq/MI+qvzCPgAAAAtzc2gtZWQyNTUxOQAAACBNkoyert5NF60C
-2rjOy+AILyPoPkGR2q4Fc/OmnfAeXQAAAED6zsQ7eTXA+yBDkw3/0A65h6q3
-y/LQartCCPYFBb+vC02SjJ6u3k0XrQLauM7L4AgvI+g+QZHargVz86ad8B5d
+
+AAtzc2gtZWQyNTUxOQAAACCAZpIqWjfT3tGuR4Xz+e6Cw1CXaZT2qvrJhgTJ
+nDff7wAAAJAhtFL2IbRS9gAAAAtzc2gtZWQyNTUxOQAAACCAZpIqWjfT3tGu
+R4Xz+e6Cw1CXaZT2qvrJhgTJnDff7wAAAEDSvbiNPJz3gaknOq4NpKVeB0ha
+EZfwyaBuUPtR/bGLYoBmkipaN9Pe0a5HhfP57oLDUJdplPaq+smGBMmcN9/v
+
 AAAAB3ZhZ3JhbnQBAgMEBQY=
 -----END OPENSSH PRIVATE KEY-----
diff --git a/.vagrant/machines/default/virtualbox/synced_folders b/.vagrant/machines/default/virtualbox/synced_folders
index 37246f821..10edf9f09 100644
--- a/.vagrant/machines/default/virtualbox/synced_folders
+++ b/.vagrant/machines/default/virtualbox/synced_folders
@@ -1 +1,2 @@
-{"virtualbox":{"/vagrant":{"guestpath":"/vagrant","hostpath":"C:/Users/HP/SCC Practical/spring-petclinic","disabled":false,"__vagrantfile":true}}}
\ No newline at end of file
+{"virtualbox":{"/home/vagrant/petclinic":{"guestpath":"/home/vagrant/petclinic","hostpath":"C:/Users/Asus User/Desktop/workspace_SCC/spring-petclinic","disabled":false,"__vagrantfile":true}}}
+
diff --git a/.vagrant/machines/default/virtualbox/vagrant_cwd b/.vagrant/machines/default/virtualbox/vagrant_cwd
index fda7ec558..a08db504b 100644
--- a/.vagrant/machines/default/virtualbox/vagrant_cwd
+++ b/.vagrant/machines/default/virtualbox/vagrant_cwd
@@ -1 +1,5 @@
-C:/Users/HP/SCC Practical/spring-petclinic
\ No newline at end of file
+<<<<<<< HEAD
+C:/Users/HP/SCC Practical/spring-petclinic
+=======
+C:/Users/Asus User/Desktop/workspace_SCC/spring-petclinic
+>>>>>>> 64ca1a6e8d6262a76717e6ee9e02d13aa15cd1e8
diff --git a/Vagrantfile b/Vagrantfile
index 330b32b94..7ddc4579b 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -11,8 +11,13 @@ Vagrant.configure("2") do |config|
   end
 
   # Configuring VirtualBox network settings
+<<<<<<< HEAD
   config.vm.network "forwarded_port", guest: 8080, host: 8086
 ~
+=======
+  config.vm.network "forwarded_port", guest: 8080, host: 8087
+
+>>>>>>> 64ca1a6e8d6262a76717e6ee9e02d13aa15cd1e8
   # Configuring VirtualBox folder settings
   config.vm.synced_folder ".", "/home/vagrant/petclinic"
 
@@ -24,7 +29,11 @@ Vagrant.configure("2") do |config|
     APP_DIR="/home/vagrant/petclinic"
     REPO_URL="https://github.com/yiting68/spring-petclinic.git"
     JAR_NAME="spring-petclinic-3.4.0.jar"
+<<<<<<< HEAD
     SERVICE_NAME="petclinic"~~
+=======
+    SERVICE_NAME="petclinic"
+>>>>>>> 64ca1a6e8d6262a76717e6ee9e02d13aa15cd1e8
 
     # Clone Spring PetClinic project if does not exist
     if [ ! -d "$APP_DIR/.git" ]; then
@@ -43,6 +52,11 @@ Vagrant.configure("2") do |config|
 
     # Run the JAR file
     nohup java -jar build/libs/$JAR_NAME > $APP_DIR/app.log 2>&1 &
+<<<<<<< HEAD
 
   SHELL
-end
\ No newline at end of file
+end
+=======
+  SHELL
+end
+>>>>>>> 64ca1a6e8d6262a76717e6ee9e02d13aa15cd1e8
diff --git a/src/main/scss/header.scss b/src/main/scss/header.scss
index 7cb1a7888..2482ff3ce 100644
--- a/src/main/scss/header.scss
+++ b/src/main/scss/header.scss
@@ -19,8 +19,8 @@
 
 .navbar a.navbar-brand span {
   display: block;
-  width: 229px;
-  height: 46px;
+  width: 231px;
+  height: 44px;
   background: url("../images/spring-logo-dataflow.png") -1px -48px no-repeat;
   opacity: 0;
   -moz-transition: opacity 0.12s ease-in-out;
diff --git a/src/main/scss/petclinic.scss b/src/main/scss/petclinic.scss
index 065b8678a..643f6c805 100644
--- a/src/main/scss/petclinic.scss
+++ b/src/main/scss/petclinic.scss
@@ -105,7 +105,7 @@ h1 {
 
 .index-page--subtitle {
   font-size: 18px;
-  line-height: 24px;
+  line-height: 23px;
   margin: 0 0 30px;
 }
 
@@ -114,7 +114,7 @@ h1 {
 }
 
 #job-params-modal .modal-dialog {
-  width: 90%;
+  width: 92%;
   margin-left:auto;
   margin-right:auto;
 }