Change Line 1 and 2 - Conflict test