Conflicts Testing

Line 1 and 3