merge finished
converter function changed
merge and deleted
merge and deleted files