Added mercurial and subversion
fixed merge issue