FIX surface view black screen issue; add verify UI
discard conflict file