merge neew stuff