Eluna: Fix merge conflicts, Fix possible crash on startup, Update version hash