adding support for project editing and creation
resolve merge conflicts