Fixed merge issues

When you reverted your merge, it removed all the gridview files and
stuff for some reason. I got it back.