same data and fixed merge