fixed merge things