file reading
solved merge conflict