Deleted last line in mergeconflict.txt
test f push