fixed merge thing