Native Merging and Conflict Resolving in RemObjects GitBrowser | Hacker News Reader