solve barbarians.sql conflict