Renamed Resolver to ConflictResolver

Added more implementation notes and TODOs