Bugs fix. prevent all probable side effects of changes for fixed bugs from happening.

Author: RMoraffah

PostgreSQL/src/backend/utils/misc/recathon.c

@@ -4500,7 +4500,7 @@ applyItemSim(RecScanState *recnode, char *itemmodel)
 
 	ratedTable = recnode->ratedTable;
 
-<<<<<<< HEAD
+
 	querystring = (char*) palloc(1024*sizeof(char));
 
 	// For every item we've rated, we need to obtain its similarity