Merging error in Basic unit fixed