Deleted last line in mergeconflict.txt
test f push
1.5 changes, 1st direc.