Adding route to list files
resolving conflicts of the last commit