Eluna fix cata merge