lines added to test conflict