Grid made for the view
Fix merge conf