change in projects add
conflict resolved