[merge] Resolve merge conflicts.
[merge] Resolve merge conflicts.

sleticalboy/sleticalboy.github.io,sleticalboy/sleticalboy.github.io,sleticalboy/sleticalboy.github.io,sleticalboy/sleticalboy.github.io