FIxed failed merge that resulted a duplicate line