manual merge noels stuff