fixed merge for real