Use a real object to represent conflicts

The entry names are known i.e. ```ours```, ```theirs``` and ```ancestor```. This should be slightly faster than looking it up via a hash. This also exposes these entries via accessors, rather than looking them up in a hash (personal preference, less chance for typos).