Fixed bg
Added tribe
Fixed conflict