correction after wrong merge