better template for grid challenge
better template
fix typo
fixing conflict