commit
resolved conflict
add fopen