A conflict

The first line was deleted and replaced