Fixed merge of page