Update Test File for Conflict2.txt