corrected merging issue