merging issues corrected