removed left in merge lines