add logging
fix conflict
dev upate flag
dev can update
conflict fixed