Remove useless file
Add grid to makefile
Fix conflicts