changes in projects add
conflict resolved