Working on 2-watch literals scheme

There is a bug that causes an infinite loop, which is probably related
to conflict resolution.