MAJOR: Implement conflict handling based on machine name (last resort after vector clock and timestamp comparison); Discovered another bug with the last common DBV determination