Thank you! Glad you were able to join the jam as well.
Dealing with merge conflicts for the shared spite and map data was definitely the biggest challenge that we had.