fixed merge shit