page and layout working
conflict solved