I&#39;m glad we had this meeting to resolve conflict