can add items/rooms to database
fix merge conflicts