Removing Merge Conflict Tests
Removing Merge Conflict Tests

Removed all the comments for the git conflict tests.

Signed-off-by: Adam Brenner <9cc684d88b0f2ebc56e10f3e7bbaa0a7ac1e054c@uci.edu>

abrenner/cs122c-project2,abrenner/cs122c-project2,abrenner/cs122c-project2