add a line from feature2 branch