fix mergeconflict in aliases

craftguide.lua

craftitems.lua

enchanting.lua

handlers/registration.lua

itemframe.lua

mailbox.lua

mechanisms.lua

nodes.lua

textures/mailbox_blank16.png

textures/xdecor_book_open.png

textures/xdecor_glyph1.png

textures/xdecor_glyph10.png

textures/xdecor_glyph11.png

textures/xdecor_glyph12.png

textures/xdecor_glyph13.png

textures/xdecor_glyph14.png

textures/xdecor_glyph15.png

textures/xdecor_glyph16.png

textures/xdecor_glyph17.png

textures/xdecor_glyph18.png