Fixed merge issue with HEAD in code