files view and view model
merge