Update Barbarians.sql

solving barbarians.sql conflict