updates bad merege fixed