diff --git a/approvedImages.class.php b/approvedImages.class.php
index d50f054..5d8cf7a 100644
--- a/approvedImages.class.php
+++ b/approvedImages.class.php
@@ -38,7 +38,11 @@ public function get_approved_images() {
    * @param string $savedImages
    * 
    */
+<<<<<<< HEAD
     
+=======
+
+>>>>>>> f1b143821875c0370200f046e2e84e7545a90e45
     function insert_approved_images($savedImages) {
 
          if(!empty($savedImages)) { 
diff --git a/nbproject/private/private.properties b/nbproject/private/private.properties
deleted file mode 100644
index 76b1562..0000000
--- a/nbproject/private/private.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-index.file=index.php
-url=http://localhost/instagramScraper/
diff --git a/nbproject/project.properties b/nbproject/project.properties
deleted file mode 100644
index 024c098..0000000
--- a/nbproject/project.properties
+++ /dev/null
@@ -1,7 +0,0 @@
-include.path=${php.global.include.path}
-php.version=PHP_53
-source.encoding=UTF-8
-src.dir=.
-tags.asp=false
-tags.short=false
-web.root=.
diff --git a/nbproject/project.xml b/nbproject/project.xml
deleted file mode 100644
index b335af4..0000000
--- a/nbproject/project.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://www.netbeans.org/ns/project/1">
-    <type>org.netbeans.modules.php.project</type>
-    <configuration>
-        <data xmlns="http://www.netbeans.org/ns/php-project/1">
-            <name>instagramScraper</name>
-        </data>
-    </configuration>
-</project>
diff --git a/saveApprovedImages.php b/saveApprovedImages.php
index 5140180..aac073b 100644
--- a/saveApprovedImages.php
+++ b/saveApprovedImages.php
@@ -10,8 +10,12 @@
 
 	<div style='text-align:center'>
             <p></p>	
+<<<<<<< HEAD
 <h3>Images Approved!</h3>
 
+=======
+<h3>Images Approved</h3>
+>>>>>>> f1b143821875c0370200f046e2e84e7545a90e45
 <?php
  if(!empty($_POST['savedImages'])) {