report format completed
deleted some files
conflicts removed