display info in grid
resolve conflicts