ADD settings activity
RESOLVE conflicts