fix mergeconflicts

.luacheckrc

game_api.txt

minetest.conf.example

mods/beds/api.lua

mods/boats/README.txt

mods/boats/depends.txt

mods/boats/init.lua

mods/boats/license.txt

mods/boats/models/boats_boat.obj

mods/boats/textures/boats_inventory.png

mods/boats/textures/boats_wield.png

mods/bones/init.lua

mods/carts/cart_entity.lua

mods/carts/rails.lua

mods/creative/init.lua

mods/creative/inventory.lua

mods/default/README.txt

mods/default/crafting.lua

mods/default/craftitems.lua

mods/default/functions.lua