This is a non-conflicting change to line 1.
This is line 2.
This is line 3.