new changes
files added
deleted file
conflict removed
added some files
conflict removed