Fixed locals not being merged