I made similar changes as Jamey to fix deprecations, resulting in conflicts that I can't figure out how to resolve. Is there a way to rollback a local commit so I can sync back up with the main XCB repository? Ian