added cell formatting
fixed all conflicts