Minor changes

debian/oglog.postinst

@@ -248,7 +248,6 @@ create_opensearch_index() {
     done
 }
 
-<<<<<<< HEAD
 
 configure_prometheus() {
     local PROMETHEUS_CONFIG="/etc/prometheus/prometheus.yml"
@@ -270,8 +269,6 @@ EOF
     done
 }
 
-=======
->>>>>>> 0282911 (Initial commit)
 restart_services() {
     echo "Restarting services..."
     systemctl daemon-reload
@@ -308,10 +305,7 @@ case $1 in
             configure_opensearch_dashboards_certificates
             configure_journalbeat_certificates
             configure_grafana
-<<<<<<< HEAD
             configure_prometheus
-=======
->>>>>>> 0282911 (Initial commit)
             restart_services
             sleep 5
             echo "Creating OpenSearch index patterns and initial index..."