adjusted file read
merge conflicts