Eluna fix merge changes