change a couple lines in conflict.txt