fixed duplicated lines after bad merge