restore from mucked merge