James Allison has returned to the role of technical director at the Mercedes Formula One team after switching jobs with Mike Elliott.