resolved merging issue