Clean up merge conflict.

* macfont.m (macfont_draw):
* nsterm.m (ns_mouse_position, judge): Clean up merge conflict.