delete mergeconflict file