app name + conditions scrollView update
conflict resolved