resolved merge conflict(wth? I work alone)
removed localhost references