Merge ELLIE into the master branch