Update Conflict Jeff Commit