merging in one line fix