Adding _site to git
Adding _site to git
Resolved merge