ToBI_GPR.grm merged

isr-grammar/english/ToBI_GPR/ToBI_GPR.grm

@@ -134,21 +134,15 @@ $locationCategory: appliance
 				
 $appliance: fridge
 			| sink
-<<<<<<< HEAD
-			| TV;
-=======
 			| TV
 			| plant;
->>>>>>> 5cef7c28c55248569ccdd019fa4d86c17646c8e4
-
+			
 $shelf: hanger
 	| shelf;
 		
 $bin: waste;
 
 $seat: couch
-<<<<<<< HEAD
-		| bar
 		| lounge
 		| bed
 		| armchair;
@@ -156,19 +150,12 @@ $seat: couch
 $table: desk
 		| dinnertable
 		| side_table
-		| couch_table;
-=======
-		| side_table
+		| couch_table
 		| bar
 		| lounge
-		| bed
 		| couch_table
 		| armchair;
 
-$table: desk
-		| dinnertable;
->>>>>>> 5cef7c28c55248569ccdd019fa4d86c17646c8e4
-
 $room: kitchen
 		| living_room
 		| dining_room;
@@ -182,14 +169,9 @@ $object: $drink
 $objectCategory:  drink
 		| food
 		| snack
-<<<<<<< HEAD
 		| stuff
 		| medicine;
-=======
-		| stuff;
->>>>>>> 5cef7c28c55248569ccdd019fa4d86c17646c8e4
 		
-
 $drink: coke
 	| redbull
 	| juice
@@ -204,18 +186,9 @@ $food: noodles
 	| chocolate
 	| hazelnuts;
 
-<<<<<<< HEAD
 $stuff: matches
 	| cards
 	| flowers
-=======
-$stuff: bandaids
-	| matches
-	| cards
-	| flowers
-	| creme
-	| kleenex
->>>>>>> 5cef7c28c55248569ccdd019fa4d86c17646c8e4
 	| sponge
 	| bag
 	| headphone
@@ -223,13 +196,10 @@ $stuff: bandaids
 	| tape
 	| cup
 	| microphone;
-<<<<<<< HEAD
 
 $medicine: bandaids
 			| creme
 			| kleenex;
-=======
->>>>>>> 5cef7c28c55248569ccdd019fa4d86c17646c8e4
 
 $determiner: the 
             | a