notes management started
unwanted file deleted
conflict removed