Refactored GeoGitTransaction and added an event for merge conflicts.