Conflicts?

The Neville Chamberlain of github