resolved conflict on settings