do something
add file and modify description.txt
handle conflicts