setup page stuff
fix conflicts