diff --git a/core/hw/pvr/ta_ctx.h b/core/hw/pvr/ta_ctx.h
index 53156ddc9..b8fc77690 100644
--- a/core/hw/pvr/ta_ctx.h
+++ b/core/hw/pvr/ta_ctx.h
@@ -146,11 +146,7 @@ struct TA_context
 
 	void MarkRend()
 	{
-<<<<<<< HEAD
 		rend.proc_start = tad.thd_root;
-=======
-		rend.proc_start = rend.proc_end;
->>>>>>> Stored TA command stream persists on TA_LIST_INIT, until first actual write.
 		rend.proc_end = tad.End();
 	}
 	void Alloc()