diff --git a/Chinook_Rev1.sql b/Chinook_Rev1.sql
index 4dcd71d..56d0e19 100644
--- a/Chinook_Rev1.sql
+++ b/Chinook_Rev1.sql
@@ -27,45 +27,9 @@ CREATE TABLE `GooglePay`
     CONSTRAINT `PK_GooglePay` PRIMARY KEY (`PayId`)
 );
 
-<<<<<<< HEAD
-=======
-CREATE TABLE `Invoice`
-(
-    `InvoiceId` INT NOT NULL,
-    `CustomerId` INT NOT NULL,
-    `InvoiceDate` DATETIME NOT NULL,
-    `BillingAddress` NVARCHAR(70),
-    `BillingCity` NVARCHAR(40),
-    `BillingState` NVARCHAR(40),
-    `BillingCountry` NVARCHAR(40),
-    `BillingPostalCode` NVARCHAR(10),
-    `Total` NUMERIC(10,2) NOT NULL,
-    `PayId` INT,
-    CONSTRAINT `PK_Invoice` PRIMARY KEY  (`InvoiceId`)
-);
-
-CREATE TABLE `InvoiceLine`
-(
-    `InvoiceLineId` INT NOT NULL,
-    `InvoiceId` INT NOT NULL,
-    `TrackId` INT NOT NULL,
-    `UnitPrice` NUMERIC(10,2) NOT NULL,
-    `Quantity` INT NOT NULL,
-    `PayID` INT NOT NULL,
-    CONSTRAINT `PK_InvoiceLine` PRIMARY KEY  (`InvoiceLineId`)
-);
-
-CREATE TABLE `MediaType`
-(
-    `MediaTypeId` INT NOT NULL,
-    `Name` NVARCHAR(120),
-    CONSTRAINT `PK_MediaType` PRIMARY KEY  (`MediaTypeId`)
-);
-
->>>>>>> origin/master
 CREATE TABLE `MyPlaylist`
 (
-    `PlaylistId` INT NOT NULL,
+    `PlaylistId` INT NOT NULL AUTO_INCREMENT,
     `Name` NVARCHAR(120),
     `CustomerId` INT NOT NULL,
     CONSTRAINT `PK_MyPlaylist` PRIMARY KEY  (`PlaylistId`)
@@ -80,14 +44,14 @@ CREATE TABLE `MyPlaylistTrack`
 
 CREATE TABLE `Orders`
 (
-	`OrderId` INT NOT NULL,
+	`OrderId` INT NOT NULL AUTO_INCREMENT,
     `CustomerId` INT NOT NULL,
     CONSTRAINT `PK_Orders` PRIMARY KEY (`OrderId`)
 );
 
 CREATE TABLE `OrderTracks`
 (
-	`OrderTrackId` INT NOT NULL,
+	`OrderTrackId` INT NOT NULL AUTO_INCREMENT,
     `OrderId` INT NOT NULL,
     `TrackId` INT NOT NULL,
     CONSTRAINT `PK_OrderTracks` PRIMARY KEY (`OrderTrackID`)
@@ -95,14 +59,14 @@ CREATE TABLE `OrderTracks`
 
 CREATE TABLE `Payment`
 (
-	`PayId` INT NOT NULL,
+	`PayId` INT NOT NULL AUTO_INCREMENT,
     `CustomerId` INT NOT NULL,
 	CONSTRAINT `PK_Payment` PRIMARY KEY (`PayId`)
 );
 
 CREATE TABLE `Person`
 (
-	`PersonId` INT NOT NULL,
+	`PersonId` INT NOT NULL AUTO_INCREMENT,
     `FirstName` NVARCHAR(40) NOT NULL,
     `LastName` NVARCHAR(20) NOT NULL,
     `Address` NVARCHAR(70),