Failed merge on a specific file also fix for std and string changes in my embparser