Safe merge