item flag fixes discovered after a few merges

include/Import/refimport.php

@@ -260,11 +260,7 @@ function reflect_comment_store($channel,$post,$comment,$user) {
 	$arr['edited'] = $comment['created'];
 	$arr['author_xchan'] = $hash;
 	$arr['owner_xchan'] = $channel['channel_hash'];
-<<<<<<< HEAD
 	$arr['item_origin'] = 1;
-=======
-	$arr['item_flags'] = ITEM_ORIGIN;
->>>>>>> master
 	$arr['item_wall'] = 1;
 	$arr['verb'] = ACTIVITY_POST;
 	$arr['comment_policy'] = 'contacts';