Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/bmesh/bmesh.h
check_spelling