file management api partially implemented
conflict resolved