Made it so conflicts are not stored on the base repository during transactions.
Fixed an issue with the conflicts being stored in the wrong directory.