changed textfile again
fix merge conflict