Tile entity for wheat crop
Fixed conflicts