changing goals
conflict resolved