setting up project
merge