Added changes to avoid conflicts with hg repositories