Correction of imports and merge comments