* Opt in future proof gradle features * Resolve merge conflicts
Co-Authored By: Mariell Hoversholm <proximyst@proximyst.com>