fixed a bunch of conflicts

program2/priorityqueue.cpp

@@ -16,7 +16,7 @@ void PriorityQueue::initiateHeap(int capacity){
     heapArray = new int[max_size + 1];
 }
 
-// inserts a new key into end of heap array to then 
+// inserts a new key into end of heap array to then
 void PriorityQueue::insert(int key){
   if(heap_size == max_size){
     std::cout << "PriorityQueue::insert called on full priority queue" << std::endl;

program2/priorityqueue.h

@@ -1,4 +1,3 @@
-
 // include guard
 #ifndef PRIORITYQ_H
 #define PRIORITYQ_H