Fixing conflict

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@175298 a5903396-d722-0410-b921-86c7d4935375
Fixing conflict

git-svn-id: https://svn.wso2.org/repos/wso2/trunk/tools@175301 a5903396-d722-0410-b921-86c7d4935375