Lines merge tests added