Fix code merge for suggestions