local changes
resolved merge conflict, enabled site hrefs