continuing projects
fixed project merge conflict