adding project brief
merge conflict