repared confilict in initial projects