Fix line duplicated in merge