ok poor merge of daily page