server side rendering wip
resolved conflict