made a final change with conflict