add 2 pages on the edit container
fixed conflicts