file 1 change -conflict comment