Copyright © 2005 Ozona Systems
Updated Version with conflict detection