Changed NO_CONTENT for CONFLICT