took out merge lines