fixed file read bug
fixed conflicts