trust after conflict