Add zerg logo
Resolve merge problems