third step logic has been finished
files after merge