Move the content from your subdomain (ex , subdomain.yourdomain.com) folder (ftp - /homedir/public_html/subdomain) (you will have admin , api , applications , datastore , uploads , etc ) , to public_html , and then edit in conf_global.php , 'base_url' => 'http://yourdomain.com', .
Then go you are good to go.