first commit
merge conflict resolved
track new files
delete some file
delete some files
database