fix uncorrect merging