an error due to merging corrected