First cut of "resolve conflict" operation

Needs some more error handling.
Correct handling of IN sql operator
Make lint slightly happier
Inspector Pingu and the Case of the Missing Case