Update

Updates

Here are the updates for Conquer.