conflcts fixed
standings tab / devconf app