merging issue fix