Fix merge of edit page