fixed obs conflict