* Add warning for pageProps GSSP conflict * Update warning * Update to merge pageProps instead of warn on conflict * bump * Update merging