server changes
merge
pretty urls