fixed merge funkiness