Fixing merge conflicts in nellie-new