cleanup
toggle my apps filter
conflict resolve