user 1 adds test_file.txt
resolved conflict between two users