settings changed a bit + removed logging to console
conflict