added text to oc-panel advertisement in tips
conflict in settings general resolved