added line in merge