goods controller with index and search views
merge conflict resolve