created grid for layout
merging two files
trying to merge to push