resolve merge with static-pages-exercises