Fixed an issue where the JS escaped code was not properly escaped in bash.
Changed the hook to not be symlink-compatible.
Minor updates to git-conflicts.

- It now supports to be called from non-root urls.