Fixing merge with table, bug with claiming castles