fixed a merging issue