Conflicts now work properly