fixed an api part that read weird
updated read me and back to default conflictClause